diff --git a/Changelog.draft.rst b/Changelog.draft.rst
index b8c82f8..888f328 100644
--- a/Changelog.draft.rst
+++ b/Changelog.draft.rst
@@ -16,6 +16,8 @@ New Features
 Changes
 -------
 
+* TTYUI ouput improved.
+
 Bug Fixes
 ---------
 
diff --git a/offlineimap/accounts.py b/offlineimap/accounts.py
index 8c03e69..7e87909 100644
--- a/offlineimap/accounts.py
+++ b/offlineimap/accounts.py
@@ -252,8 +252,7 @@ class AccountSynchronizationMixin:
                     thread = InstanceLimitedThread(\
                         instancename = 'FOLDER_' + self.remoterepos.getname(),
                         target = syncfolder,
-                        name = "Folder sync %s[%s]" % \
-                        (self.name, remotefolder.getvisiblename()),
+                        name = "Folder sync [%s]" % self.name,
                         args = (self.name, remoterepos, remotefolder, localrepos,
                                 statusrepos, quick))
                     thread.setDaemon(1)
diff --git a/offlineimap/ui/TTY.py b/offlineimap/ui/TTY.py
index ee18dfa..d88de1b 100644
--- a/offlineimap/ui/TTY.py
+++ b/offlineimap/ui/TTY.py
@@ -41,7 +41,8 @@ class TTYUI(UIBase):
                 threadname = currentThread().name
             except AttributeError:
                 threadname = currentThread().getName()
-            if (threadname == s._lastThreaddisplay):
+            if (threadname == s._lastThreaddisplay \
+                    or threadname == 'MainThread'):
                 print " %s" % msg
             else:
                 print "%s:\n %s" % (threadname, msg)