diff --git a/k9mail/src/main/java/com/fsck/k9/activity/MessageList.java b/k9mail/src/main/java/com/fsck/k9/activity/MessageList.java
index 1c3244324..9e01b846a 100644
--- a/k9mail/src/main/java/com/fsck/k9/activity/MessageList.java
+++ b/k9mail/src/main/java/com/fsck/k9/activity/MessageList.java
@@ -379,7 +379,9 @@ public class MessageList extends K9Activity implements MessageListFragmentListen
             Collection<Account> accounts = Preferences.getPreferences(this).getAvailableAccounts();
             for (Account account : accounts) {
                 if (String.valueOf(account.getAccountNumber()).equals(accountId)) {
-                    mMessageReference = new MessageReference(account.getUuid(), segmentList.get(1), segmentList.get(2), null);
+                    String folderName = segmentList.get(1);
+                    String messageUid = segmentList.get(2);
+                    mMessageReference = new MessageReference(account.getUuid(), folderName, messageUid, null);
                     break;
                 }
             }
diff --git a/k9mail/src/main/java/com/fsck/k9/fragment/MessageListFragment.java b/k9mail/src/main/java/com/fsck/k9/fragment/MessageListFragment.java
index 29049d587..9f681cff5 100644
--- a/k9mail/src/main/java/com/fsck/k9/fragment/MessageListFragment.java
+++ b/k9mail/src/main/java/com/fsck/k9/fragment/MessageListFragment.java
@@ -2992,7 +2992,11 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
         for (int i = 0, len = mAdapter.getCount(); i < len; i++) {
             Cursor cursor = (Cursor) mAdapter.getItem(i);
 
-            MessageReference ref = new MessageReference(cursor.getString(ACCOUNT_UUID_COLUMN), cursor.getString(FOLDER_NAME_COLUMN), cursor.getString(UID_COLUMN), null);
+            String accountUuid = cursor.getString(ACCOUNT_UUID_COLUMN);
+            String folderName = cursor.getString(FOLDER_NAME_COLUMN);
+            String messageUid = cursor.getString(UID_COLUMN);
+            MessageReference ref = new MessageReference(accountUuid, folderName, messageUid, null);
+
             messageRefs.add(ref);
         }
 
@@ -3054,9 +3058,11 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
 
     private MessageReference getReferenceForPosition(int position) {
         Cursor cursor = (Cursor) mAdapter.getItem(position);
-        MessageReference ref = new MessageReference(cursor.getString(ACCOUNT_UUID_COLUMN), cursor.getString(FOLDER_NAME_COLUMN), cursor.getString(UID_COLUMN), null);
 
-        return ref;
+        String accountUuid = cursor.getString(ACCOUNT_UUID_COLUMN);
+        String folderName = cursor.getString(FOLDER_NAME_COLUMN);
+        String messageUid = cursor.getString(UID_COLUMN);
+        return new MessageReference(accountUuid, folderName, messageUid, null);
     }
 
     private void openMessageAtPosition(int position) {