diff --git a/extensions/webmail/templates/index.html b/extensions/webmail/templates/index.html
index f68bb8f59..816bfe501 100644
--- a/extensions/webmail/templates/index.html
+++ b/extensions/webmail/templates/index.html
@@ -93,7 +93,6 @@
 
   loadCompose = function(event) {
     event.stop();
-    $clear(rtimer);
     current_anchor.baseurl("compose").update();
   }
   register_callback("compose", compose_callback);
@@ -115,6 +114,11 @@
   register_callback("forward", compose_callback);
  
   var rtimer = null;  
+
+  window.addEvent("pageRefresh", function() {
+    $clear(rtimer);
+  });
+
   refreshFolder = function() {
     var query = current_anchor.serialized.substring(1);
     $clear(rtimer);
@@ -135,7 +139,6 @@
     if (!$defined(obj)) {
       obj = $(event.target);
     }
-    $clear(rtimer);
     current_anchor.parse_string(gethref(obj), true).setparams(navparams);
     current_anchor.update();
   }
diff --git a/static/js/common.js b/static/js/common.js
index 6b804a362..1fe0f2ddc 100644
--- a/static/js/common.js
+++ b/static/js/common.js
@@ -113,6 +113,7 @@ function HashWrapper(deflocation) {
     };
 
     this.update = function(force) {
+        window.fireEvent("pageRefresh");
         location.hash = this.serialize();
         if ($defined(force)) {
             this.force = force;