diff --git a/src/com/android/email/MessagingController.java b/src/com/android/email/MessagingController.java
index a6a1f8021..ccff9e695 100644
--- a/src/com/android/email/MessagingController.java
+++ b/src/com/android/email/MessagingController.java
@@ -1871,7 +1871,7 @@ public class MessagingController implements Runnable {
                     remoteFolder.open(OpenMode.READ_WRITE);
 
                     // 3. Set up to download the entire message
-                    Message remoteMessage = remoteFolder.getMessage(remoteServerId);
+                    Message remoteMessage = remoteFolder.getMessage(message.mServerId);
                     FetchProfile fp = new FetchProfile();
                     fp.add(FetchProfile.Item.BODY);
                     remoteFolder.fetch(new Message[] { remoteMessage }, fp, null);