diff --git a/plugins/enigma/skins/elastic/templates/keys.html b/plugins/enigma/skins/elastic/templates/keys.html
index ca76df493..a57279523 100644
--- a/plugins/enigma/skins/elastic/templates/keys.html
+++ b/plugins/enigma/skins/elastic/templates/keys.html
@@ -68,7 +68,9 @@
 			</span>
 		</div>
 	</div>
-	<roundcube:object name="keyframe" id="keyframe" src="/watermark.html" />
+	<div class="iframe-wrapper">
+		<roundcube:object name="keyframe" id="keyframe" src="/watermark.html" />
+	</div>
 </div>
 
 <div id="export-menu" class="popupmenu">
diff --git a/plugins/help/skins/elastic/templates/help.html b/plugins/help/skins/elastic/templates/help.html
index 2391b20c3..30dd86185 100644
--- a/plugins/help/skins/elastic/templates/help.html
+++ b/plugins/help/skins/elastic/templates/help.html
@@ -23,7 +23,9 @@
 		<a class="button icon menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
 		<span class="header-title"><roundcube:label name="help.help" /></span>
 	</div>
-	<roundcube:object name="contentframe" id="helpcontentframe" src="/watermark.html" title="arialabelhelpcontent" />
+	<div class="iframe-wrapper">
+		<roundcube:object name="contentframe" id="helpcontentframe" src="/watermark.html" title="arialabelhelpcontent" />
+	</div>
 </div>
 
 <roundcube:include file="includes/footer.html" />
diff --git a/plugins/managesieve/skins/elastic/templates/managesieve.html b/plugins/managesieve/skins/elastic/templates/managesieve.html
index db11f44cc..a6af478ee 100644
--- a/plugins/managesieve/skins/elastic/templates/managesieve.html
+++ b/plugins/managesieve/skins/elastic/templates/managesieve.html
@@ -52,8 +52,10 @@
 		</div>
 	</div>
 	<h2 id="aria-label-filterframe" class="voice"><roundcube:label name="managesieve.arialabelfilterform" /></h2>
-	<roundcube:object name="filterframe" id="filter-box" src="/watermark.html" title="managesieve.arialabelfilterform"
-		aria-labelledby="aria-label-filterform" />
+	<div class="iframe-wrapper">
+		<roundcube:object name="filterframe" id="filter-box" src="/watermark.html" title="managesieve.arialabelfilterform"
+			aria-labelledby="aria-label-filterform" />
+	</div>
 </div>
 
 <div id="filterset-menu" class="popupmenu">