diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 877ef6dbd..deeab5a0e 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -2396,19 +2396,7 @@ public class MessageList
         }
         public MessageInfoHolder getMessage(Message message)
         {
-
-            synchronized (mAdapter.messages)
-            {
-                int index = mAdapter.messages.indexOf(message);
-                if (index == -1)
-                {
-                    return null;
-                }
-                else
-                {
-                    return mAdapter.messages.get(index);
-                }
-            }
+            return getMessage(message.makeMessageReference());
         }
 
         // XXX TODO - make this not use a for loop