diff --git a/mail/js/app.js b/mail/js/app.js
index 833751a773..15c4fdb99f 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -4700,7 +4700,7 @@ app.classes.mail = AppJS.extend(
 
 			if (typeof widgets[widget].widget != 'undefined'
 					&& typeof widgets[expanderBtn].widget != 'undefined'
-					&& widgets[widget].widget.get_value().length == 0
+					&& (!widgets[widget].widget.value || !widgets[widget].widget.value.length)
 					&& actions.indexOf(expanderBtn)<0)
 			{
 				widgets[expanderBtn].widget.set_disabled(false);
diff --git a/pixelegg/js/fw_mobile.js b/pixelegg/js/fw_mobile.js
index e42af291cd..70e770af24 100644
--- a/pixelegg/js/fw_mobile.js
+++ b/pixelegg/js/fw_mobile.js
@@ -834,7 +834,7 @@ import {tapAndSwipe} from "../../api/js/tapandswipe";
 			{
 				for (var i=0; i < window.framework.popups.length; i++)
 				{
-					if (window.framework.popups[i].$iFrame[0].contentWindow === _wnd)
+					if (window.framework.popups[i].$iFrame && window.framework.popups[i].$iFrame[0].contentWindow === _wnd)
 					{
 						return i;
 					}