diff --git a/ChangeLog b/ChangeLog
index 78221e0d3..e84ff6ad6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-22  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/MailerUI/UIxMailFolderActions.m (-emptyTrashAction:): we now
+	unsubscribe from the folders found in the trash.
+
 2012-03-21  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/SOGoUserManager.m (_compactAndCompleteContacts:):
diff --git a/UI/MailerUI/UIxMailFolderActions.m b/UI/MailerUI/UIxMailFolderActions.m
index c0c5dbf7d..3f3edfc78 100644
--- a/UI/MailerUI/UIxMailFolderActions.m
+++ b/UI/MailerUI/UIxMailFolderActions.m
@@ -489,7 +489,10 @@
       connection = [co imap4Connection];
       subfolders = [[co allFolderURLs] objectEnumerator];
       while ((currentURL = [subfolders nextObject]))
-	[connection deleteMailboxAtURL: currentURL];
+        {
+          [[connection client] unsubscribe: [currentURL path]];
+          [connection deleteMailboxAtURL: currentURL];
+        }
     }
   if (error)
     {