diff --git a/ChangeLog b/ChangeLog
index 436e5362a..75c27fef1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-07-25  Francis Lachapelle  <flachapelle@inverse.ca>
 
+	* SoObjects/Mailer/SOGoMailFolder.m
+	(-deleteUIDs:useTrashFolder:inContext:): fixed comparison with the
+	trash folder name when using subfolders (ex: INBOX/Trash).
+
 	* SoObjects/SOGo/SOGoSieveManager.m
 	(-updateFiltersForLogin:authname:password:account:): write the
 	filters before the vacation auto-reply.
diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m
index 393588c3a..1bf4c6a30 100644
--- a/SoObjects/Mailer/SOGoMailFolder.m
+++ b/SoObjects/Mailer/SOGoMailFolder.m
@@ -406,7 +406,7 @@ static NSString *defaultUserID =  @"anyone";
 	      
                   // If we are deleting messages within the Trash folder itself, we
                   // do not, of course, try to move messages to the Trash folder.
-                  if ([folderName isEqualToString: [self relativeImap4Name]])
+                  if ([folderName isEqualToString: [imap4 imap4FolderNameForURL: [self imap4URL]]])
                     {
                       *withTrash = NO;
                     }