diff --git a/UI/MailerUI/UIxMailFolderActions.m b/UI/MailerUI/UIxMailFolderActions.m
index 764e2e62c..00905351b 100644
--- a/UI/MailerUI/UIxMailFolderActions.m
+++ b/UI/MailerUI/UIxMailFolderActions.m
@@ -272,12 +272,8 @@
       [co flushMailCaches];
       connection = [co imap4Connection];
       subfolders = [[co allFolderURLs] objectEnumerator];
-      currentURL = [subfolders nextObject];
-      while (currentURL)
-	{
-	  [connection deleteMailboxAtURL: currentURL];
-	  currentURL = [subfolders nextObject];
-	}
+      while ((currentURL = [subfolders nextObject]))
+	[connection deleteMailboxAtURL: currentURL];
     }
   if (error)
     {
diff --git a/UI/MailerUI/product.plist b/UI/MailerUI/product.plist
index 27ef5d7fc..632104c29 100644
--- a/UI/MailerUI/product.plist
+++ b/UI/MailerUI/product.plist
@@ -119,7 +119,7 @@
 	expunge = {
 	  protectedBy = "View";
 	  actionClass = "UIxMailFolderActions";
-	  actionName = "emptyTrash";
+	  actionName = "expunge";
 	};
 	createFolder = {
 	  protectedBy = "View";