diff --git a/program/js/app.js b/program/js/app.js
index d2bf41e58..60daf8c32 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -835,14 +835,17 @@ function rcube_webmail()
           }
         else if (props)
            url += '&_to='+props;
-        
+
         // don't know if this is necessary...
         url = url.replace(/&_framed=1/, "");
 
         this.set_busy(true);
 
         // need parent in case we are coming from the contact frame
-        parent.window.location.href = url;
+        if (this.env.framed)
+          parent.location.href = url;
+        else
+          location.href = url;
         break;    
 
       case 'send':