diff --git a/extensions/amavis_quarantine/sql_listing.py b/extensions/amavis_quarantine/sql_listing.py
index 456d8c413..fed58ffa9 100644
--- a/extensions/amavis_quarantine/sql_listing.py
+++ b/extensions/amavis_quarantine/sql_listing.py
@@ -87,6 +87,7 @@ class SQLlisting(EmailListing):
     tbltype = Qtable
     deflocation = "listing/"
     defcallback = "updatelisting"
+    reset_wm_url = True
 
     def __init__(self, filter, **kwargs):
         self.mbc = SQLconnector(filter)
diff --git a/extensions/webmail/imap_listing.py b/extensions/webmail/imap_listing.py
index fc495d39f..2c74f2cb9 100644
--- a/extensions/webmail/imap_listing.py
+++ b/extensions/webmail/imap_listing.py
@@ -293,6 +293,7 @@ class ImapListing(EmailListing):
     tbltype = WMtable
     deflocation = "INBOX/"
     defcallback = "wm_updatelisting"
+    reset_wm_url = False
     
     def __init__(self, user, password, **kwargs):
         self.mbc = IMAPconnector(user=user, password=password)
diff --git a/lib/email_listing.py b/lib/email_listing.py
index 66973e001..c24a547b6 100644
--- a/lib/email_listing.py
+++ b/lib/email_listing.py
@@ -131,7 +131,9 @@ class EmailListing:
                 "navbar" : self.render_navbar(page),
                 "selection" : self.folder,
                 "navparams" : self.navparams,
-                "deflocation" : self.deflocation, "defcallback" : self.defcallback
+                "deflocation" : self.deflocation, 
+                "defcallback" : self.defcallback,
+                "reset_wm_url" : self.reset_wm_url
                 })
 
 class Email(object):
diff --git a/templates/common/email_listing.html b/templates/common/email_listing.html
index 49c64928d..18c661a49 100644
--- a/templates/common/email_listing.html
+++ b/templates/common/email_listing.html
@@ -43,7 +43,11 @@ window.addEvent("domready", function() {
     if (event.target.parentNode.id) {
       var url = event.target.parentNode.id + "/";
       event.target.parentNode.setStyle("background", "#ffffcc");
+      {% if reset_wm_url %} 
+      current_anchor.baseurl(url).update();
+      {% else %}
       current_anchor.addbaseurl(url).update();
+      {% endif %}
     }
   }