diff --git a/src/com/fsck/k9/controller/MessagingController.java b/src/com/fsck/k9/controller/MessagingController.java
index d0e8a81ef..c1322e330 100644
--- a/src/com/fsck/k9/controller/MessagingController.java
+++ b/src/com/fsck/k9/controller/MessagingController.java
@@ -3479,8 +3479,7 @@ public class MessagingController implements Runnable
         Folder localFolder = null;
         try
         {
-            Store localStore = account.getLocalStore();
-            localFolder = localStore.getFolder(
+            localFolder = account.getLocalStore().getFolder(
                               account.getOutboxFolderName());
             if (!localFolder.exists())
             {