diff --git a/res/layout-land/actionbar_spinner.xml b/res/layout-land/actionbar_spinner.xml
index 28c29465d..cd6f9c784 100644
--- a/res/layout-land/actionbar_spinner.xml
+++ b/res/layout-land/actionbar_spinner.xml
@@ -9,12 +9,16 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="-4dip"
-        android:textSize="14sp" />
+        android:textSize="14sp"
+        android:singleLine="true"
+        android:ellipsize="start" />
 
     <TextView
         android:id="@+id/actionbar_title_sub"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="12sp" />
+        android:textSize="12sp"
+        android:singleLine="true"
+        android:ellipsize="end" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/actionbar_spinner.xml b/res/layout/actionbar_spinner.xml
index 977f66034..494fefc05 100644
--- a/res/layout/actionbar_spinner.xml
+++ b/res/layout/actionbar_spinner.xml
@@ -9,12 +9,16 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="-4dip"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:singleLine="true"
+        android:ellipsize="start" />
 
     <TextView
         android:id="@+id/actionbar_title_sub"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall" />
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:singleLine="true"
+        android:ellipsize="end" />
 
 </LinearLayout>
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index ffa6a0ae1..8d49172ef 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -515,14 +515,7 @@ public class MessageList extends K9ListActivity implements
     private void setWindowTitle() {
         // regular folder content display
         if (mFolderName != null) {
-
-            String folderNameProc = mFolderName;
-
-            if (folderNameProc.length() > 15) {
-                folderNameProc = mFolderName.substring(0, 15) + "...";
-            }
-
-            mNavigationSpinner.setTitle(folderNameProc + " [" + mUnreadMessageCount + "]");
+            mNavigationSpinner.setTitle(mFolderName);
             mNavigationSpinner.setSubTitle(mAccount.getEmail());
 
         // query result display