Merge branch 'master' of github.com:roundcube/roundcubemail

1 files changed, 5 insertions, 3 deletions

diff --git a/program/js/app.js b/program/js/app.js
index 490234b4a..8ac5ca2e9 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1451,7 +1451,7 @@ function rcube_webmail()
 
   this.is_framed = function()
   {
-    return (this.env.framed && parent.rcmail && parent.rcmail != this && parent.rcmail.command);
+    return this.env.framed && parent.rcmail && parent.rcmail != this && typeof parent.rcmail.command == 'function';
   };
 
   this.save_pref = function(prop)
@@ -5989,8 +5989,10 @@ function rcube_webmail()
   this.replace_folder_row = function(oldid, id, name, display_name, is_protected, class_name)
   {
     if (!this.gui_objects.subscriptionlist) {
-      if (this.is_framed)
-        return parent.rcmail.replace_folder_row(oldid, id, name, display_name, is_protected, class_name);
+      if (this.is_framed()) {
+        // @FIXME: for some reason this 'parent' variable need to be prefixed with 'window.'
+        return window.parent.rcmail.replace_folder_row(oldid, id, name, display_name, is_protected, class_name);
+      }
 
       return false;
     }