diff --git a/mozilla/mailnews/imap/src/nsImapMailFolder.cpp b/mozilla/mailnews/imap/src/nsImapMailFolder.cpp
index faf45c44c9e..68e85834c9e 100644
--- a/mozilla/mailnews/imap/src/nsImapMailFolder.cpp
+++ b/mozilla/mailnews/imap/src/nsImapMailFolder.cpp
@@ -1228,8 +1228,11 @@ NS_IMETHODIMP nsImapMailFolder::EmptyTrash(nsIMsgWindow *msgWindow,
                     trashFolder->PropagateDelete(aFolder, PR_TRUE, msgWindow);
             }
         }
+
+        return NS_OK;
     }
-    return NS_OK;
+
+    return rv;
 }
 
 NS_IMETHODIMP nsImapMailFolder::Delete ()