diff --git a/ChangeLog b/ChangeLog
index 2c3b81d5e..8298567b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-05  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Mailer/SOGoMailFolder.m ([SOGoMailFolder
+	-expungeLastMarkedFolder]): do not perform the expunge if the
+	marked folder is the current folder.
+
 2008-09-04  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/MailPartViewers/UIxMailPartAlternativeViewer.m
diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m
index 43886de3e..0fabcc1a6 100644
--- a/SoObjects/Mailer/SOGoMailFolder.m
+++ b/SoObjects/Mailer/SOGoMailFolder.m
@@ -319,7 +319,8 @@ static BOOL aclConformsToIMAPExt = NO;
   if (mailSettings)
     {
       expungeURL = [mailSettings objectForKey: @"folderForExpunge"];
-      if (expungeURL)
+      if (expungeURL
+	  && ![expungeURL isEqualToString: [self imap4URLString]])
 	{
 	  folderURL = [NSURL URLWithString: expungeURL];
 	  if (![[self imap4Connection] expungeAtURL: folderURL])