diff --git a/src/com/android/email/imap2/Imap2SyncService.java b/src/com/android/email/imap2/Imap2SyncService.java
index f155fd484..871f0722f 100644
--- a/src/com/android/email/imap2/Imap2SyncService.java
+++ b/src/com/android/email/imap2/Imap2SyncService.java
@@ -2551,6 +2551,14 @@ public class Imap2SyncService extends AbstractSyncService {
 
             return sortedUids.length;
         } finally {
+            if (mBodyThread != null) {
+                try {
+                    mBodyThread.join();
+                } catch (InterruptedException e) {
+                    // It's all good
+                }
+                mBodyThread = null;
+            }
             if (mSocket != null) {
                 try {
                     // Try to logout