diff --git a/mail/js/app.js b/mail/js/app.js
index ecb787234e..fe17f1bc14 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -4393,12 +4393,17 @@ app.classes.mail = AppJS.extend(
 	{
 		var tempPrint = jQuery('div#tempPrintDiv');
 		var mailvelopeTopContainer = jQuery('div.mailDisplayContainer');
+		var originFrame = jQuery('#mail-display_mailDisplayBodySrc');
 		var iframe = jQuery(this.mailvelope_iframe_selector);
 		
 		if (tempPrint.length >0)
 		{
+			// Mailvelope iframe height is approximately equal to the height of encrypted origin message
+			// we add an arbitary plus pixels to make sure it's covering the full content in print view and
+			// it is not getting acrollbar in normal view
+			// @TODO: after Mailvelope plugin provides a hieght value, we can replace the height with an accurate value
+			iframe.addClass('mailvelopeIframe').height(originFrame[0].contentWindow.document.body.scrollHeight + 400);
 			tempPrint.hide();
-			iframe.addClass('mailvelopeIframe');
 			mailvelopeTopContainer.addClass('mailvelopeTopContainer');
 		}
 	},
diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index 80d0c27fce..c363eba045 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -803,12 +803,11 @@ blockquote blockquote blockquote blockquote blockquote blockquote{
 		padding-top: 10px;
 	}
 	div.mailDisplayContainer.mailvelopeTopContainer {
-		position:fixed !important;
 		top:190px;
 	}
 	div.mailDisplayContainer.mailvelopeTopContainer > iframe {
-	  position: inherit;
-	  min-width: 860px;
+		position: static;
+		min-width: 860px;
 	}
 }
 
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 26780e75d1..6c1b553925 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -800,12 +800,11 @@ blockquote blockquote blockquote blockquote blockquote blockquote {
     padding-top: 10px;
   }
   div.mailDisplayContainer.mailvelopeTopContainer {
-		position:fixed !important;
-		top:190px;
+	top:190px;
   }
   div.mailDisplayContainer.mailvelopeTopContainer > iframe {
-	  position: inherit;
-	  min-width: 860px;
+	position: static;
+	min-width: 860px;
   }
 }
 /* MOBILE and tablets (Portrait & Landscape) View --------------*/