diff --git a/src/com/fsck/k9/controller/MessagingController.java b/src/com/fsck/k9/controller/MessagingController.java
index 7492427a4..64003ca3f 100644
--- a/src/com/fsck/k9/controller/MessagingController.java
+++ b/src/com/fsck/k9/controller/MessagingController.java
@@ -3613,13 +3613,6 @@ public class MessagingController implements Runnable
                     lastFailure = e;
                 }
             }
-            if (localFolder.getMessageCount() == 0)
-            {
-                // No longer delete the empty local outbox every time we finish sending mail
-                // There's no real win to it and it makes the folder selection UI extra stupid
-                // (We'd need a textentry widget to set the Outbox folder rather than a folder select widget)
-                // localFolder.delete(false);
-            }
             for (MessagingListener l : getListeners())
             {
                 l.sendPendingMessagesCompleted(account);
@@ -3645,6 +3638,9 @@ public class MessagingController implements Runnable
         }
         finally
         {
+            if (lastFailure == null) {
+                cancelNotification(K9.SEND_FAILED_NOTIFICATION - account.getAccountNumber());
+            }
             closeFolder(localFolder);
         }
     }