diff --git a/mail/js/app.js b/mail/js/app.js
index 0cac39f0e3..a3bc95f0b5 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -5708,10 +5708,12 @@ app.classes.mail = AppJS.extend(
 					self.resolveExternalImages(this.contentWindow.document);
 					// Use prepare print function to copy iframe content into div
 					// as we don't want to show content in iframe (scrolling problem).
-					self.mail_prepare_print(jQuery(this));
+					if (jQuery(this.contentWindow.document.body).find('#smimePasswordRequest').length == 0)
+					{
+						iframe.set_disabled(true);
+						self.mail_prepare_print(jQuery(this));
+					}
 				}
-
-
 			});
 		});
 	},
@@ -5858,15 +5860,15 @@ app.classes.mail = AppJS.extend(
 	{
 		if (!_data) return;
 		var self = this;
+		var et2_object = egwIsMobile()? this.et2_view.widgetContainer: this.et2;
 		var data = _data;
-		var attachmentArea = this.et2.getWidgetById('previewAttachmentArea');
+		var attachmentArea = et2_object.getWidgetById('previewAttachmentArea');
 		if (attachmentArea) attachmentArea.getDOMNode().classList.remove('loading');
-		var smime_signature = this.et2.getWidgetById('smime_signature');
-		var smime_encryption = this.et2.getWidgetById('smime_encryption');
-		var $mail_container = egw(window).is_popup() ?
-								jQuery('.mailDisplayContainer'):
-								jQuery(this.et2.getWidgetById('mailPreviewContainer').getDOMNode());
-
+		var smime_signature = et2_object.getWidgetById('smime_signature');
+		var smime_encryption = et2_object.getWidgetById('smime_encryption');
+		var $mail_container = egwIsMobile()? jQuery('.mail-d-h1').next() :
+				egw(window).is_popup() ? jQuery('.mailDisplayContainer'):
+				jQuery(et2_object.getWidgetById('mailPreviewContainer').getDOMNode());
 		smime_signature.set_disabled(!data.signed);
 		smime_encryption.set_disabled(!data.encrypted);
 		if (!data.signed)
diff --git a/mail/templates/mobile/app.css b/mail/templates/mobile/app.css
index 8ad33a527b..0cb6e82027 100644
--- a/mail/templates/mobile/app.css
+++ b/mail/templates/mobile/app.css
@@ -2520,6 +2520,7 @@ div.mailComposeHeaderSection > table {
     background-color: none;
   }
   body #popupMainDiv .mail-d-h1 {
+    position: relative;
     padding-bottom: 15px;
     border-bottom: 1px solid silver;
     font-size: 12pt;
@@ -2573,9 +2574,6 @@ div.mailComposeHeaderSection > table {
     position: initial;
     margin-top: 20px;
   }
-  body #popupMainDiv #mail-view_iframe {
-    display: none;
-  }
   body #popupMainDiv div#mail-view > div {
     height: 100%;
   }
@@ -2584,6 +2582,7 @@ div.mailComposeHeaderSection > table {
   }
   body #popupMainDiv #mail-view_toaddressdetails {
     color: #26537c;
+    float: right;
   }
   body #popupMainDiv #tempPrintDiv {
     display: block;
diff --git a/mail/templates/mobile/app.less b/mail/templates/mobile/app.less
index 14ff35ea38..b503828da5 100644
--- a/mail/templates/mobile/app.less
+++ b/mail/templates/mobile/app.less
@@ -78,6 +78,7 @@
 
 
 			.mail-d-h1{
+				position: relative;
 				padding-bottom: 15px;
 				border-bottom: 1px solid silver;
 				span {
@@ -131,9 +132,6 @@
 				position: initial;
 				margin-top: 20px;
 			}
-			#mail-view_iframe {
-				display: none;
-			}
 			div#mail-view> div {
 				height: 100%;
 			}
@@ -142,6 +140,7 @@
 			}
 			#mail-view_toaddressdetails {
 				color: #26537c;
+				float: right;
 			}
 			#tempPrintDiv {
 				display:block;
diff --git a/mail/templates/mobile/view.xet b/mail/templates/mobile/view.xet
index c7eb3d4a68..917a008fc8 100644
--- a/mail/templates/mobile/view.xet
+++ b/mail/templates/mobile/view.xet
@@ -12,6 +12,10 @@
 			</hbox>
 			<hbox  class="mail-d-h1" width="100%">
 				<description align="left" id="subject" no_lang="1" readonly="true"/>
+				<hbox class="smimeIcons">
+					<image id="smime_signature" src="smime_sign" statustext="Smime signed message" disabled="true" align="right" width="24"/>
+					<image id="smime_encryption" src="smime_encrypt" statustext="Smime encrypted message" disabled="true" align="right" width="24"/>
+				</hbox>
 			</hbox>
 			<hbox class="mail-d-h2" disabled="!@fromaddress" width="100%">
 				<url-email id="fromaddress" readonly="true"/>