diff --git a/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java b/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java
index 17629dec4..5cdfac0c9 100644
--- a/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java
+++ b/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java
@@ -5475,7 +5475,9 @@ public class MessagingController implements Runnable {
             while (memIt.hasNext()) {
                 Entry<String, Memory> memoryEntry = memIt.next();
 
-                if (memoryEntry.getValue().account.getUuid().equals(account.getUuid())) {
+                String uuidForMemory = memoryEntry.getValue().account.getUuid();
+
+                if (uuidForMemory.equals(account.getUuid())) {
                     memIt.remove();
                 }
             }