diff --git a/offlineimap/head/debian/changelog b/offlineimap/head/debian/changelog
index 54bba1f..ffb7246 100644
--- a/offlineimap/head/debian/changelog
+++ b/offlineimap/head/debian/changelog
@@ -13,6 +13,8 @@ offlineimap (3.2.1) unstable; urgency=low
     a Show Log or a Hide Log menu option.  No sub-menus necessary anymore.
     This presents a much cleaner feel, more intuitive operation, and
     faster navigation.
+  * Fix for account name interpolation in dot warning from 3.2.0 from
+    Martijn Pieters.
 
  -- John Goerzen <jgoerzen@complete.org>  Wed, 24 Jul 2002 17:04:04 -0500
 
diff --git a/offlineimap/head/offlineimap.conf b/offlineimap/head/offlineimap.conf
index 656dca9..9f49227 100644
--- a/offlineimap/head/offlineimap.conf
+++ b/offlineimap/head/offlineimap.conf
@@ -99,11 +99,16 @@ footer = "\n"
 
 loglines = 5
 
+# Specifies how many lines are in the scrollback log buffer.
+
+bufferlines = 500
+
 # If true, says that the log should be enabled by default.
 # Otherwise, you have to click "Show Log" to enable the log.
 
 showlog = false
 
+
 ##################################################
 # Accounts
 ##################################################
diff --git a/offlineimap/head/offlineimap/ui/Tk.py b/offlineimap/head/offlineimap/ui/Tk.py
index ddcf1b2..a57d5ed 100644
--- a/offlineimap/head/offlineimap/ui/Tk.py
+++ b/offlineimap/head/offlineimap/ui/Tk.py
@@ -350,7 +350,7 @@ class LEDThreadFrame:
 class Blinkenlights(VerboseUI):
     def _createTopWindow(self):
         VerboseUI._createTopWindow(self, 0)
-        self.top.resizable(width = 0, height = 0)
+        #self.top.resizable(width = 0, height = 0)
         self.top.configure(background = 'black', bd = 0)
         c = LEDCanvas(self.top, background = 'black', height = 20, bd = 0,
                       highlightthickness = 0)
@@ -381,7 +381,6 @@ class Blinkenlights(VerboseUI):
         self.textenabled = 0
         self.tags = []
         self.textlock = Lock()
-        self.oldtextheight = 0
 
     def gettf(s, newtype=LEDThreadFrame):
         return VerboseUI.gettf(s, newtype, s.canvas)
@@ -401,22 +400,19 @@ class Blinkenlights(VerboseUI):
         s.gettf().setcolor('red')
         s._msg(version.banner)
         s.text.see(END)
-        #s.top.minsize(s.top.winfo_reqwidth(),
-        #              s.top.winfo_reqheight() + s.menubar.winfo_reqheight())
+        s.top.resizable(width = 0, height = 0)
         if s.config.has_option("ui.Tk.Blinkenlights", "showlog") and \
            s.config.getboolean("ui.Tk.Blinkenlights", "showlog"):
             s._togglelog()
 
     def _togglelog(s):
-        print "togglelog"
         if s.textenabled:
             s.oldtextheight = s.text.winfo_height()
             s.text.pack_forget()
             s.textenabled = 0
             s.menubar.entryconfig('Hide Log', label = 'Show Log')
             s.top.update()
-            s.top.geometry("%dx%d" % (s.top.winfo_reqwidth(),
-                                      s.top.winfo_reqheight()))
+            s.top.geometry("")
             s.top.update()
             s.top.resizable(width = 0, height = 0)
             s.top.update()
@@ -425,8 +421,7 @@ class Blinkenlights(VerboseUI):
             s.text.pack(side = BOTTOM, expand = 1, fill = BOTH)
             s.textenabled = 1
             s.top.update()
-            s.top.geometry("%dx%d" % (s.top.winfo_reqwidth(),
-                                      s.top.winfo_height() + s.oldtextheight))
+            s.top.geometry("")
             s.menubar.entryconfig('Show Log', label = 'Hide Log')
             s._rescroll()
             s.top.resizable(width = 1, height = 1)