diff --git a/src/com/android/email/activity/MessageView.java b/src/com/android/email/activity/MessageView.java
index 01532eacd..59c94fff3 100644
--- a/src/com/android/email/activity/MessageView.java
+++ b/src/com/android/email/activity/MessageView.java
@@ -319,6 +319,8 @@ public class MessageView extends Activity
         mMessageUid = intent.getStringExtra(EXTRA_MESSAGE);
         mFolderUids = intent.getStringArrayListExtra(EXTRA_FOLDER_UIDS);
 
+        findSurroundingMessagesUid();
+        
         View next = findViewById(R.id.next);
         View previous = findViewById(R.id.previous);
         /*
@@ -329,8 +331,6 @@ public class MessageView extends Activity
             next.setOnClickListener(this);
             previous.setOnClickListener(this);
 
-            findSurroundingMessagesUid();
-
             previous.setVisibility(mPreviousMessageUid != null ? View.VISIBLE : View.GONE);
             next.setVisibility(mNextMessageUid != null ? View.VISIBLE : View.GONE);