diff --git a/gray-theme/unauthenticated/iframe-styles.css b/gray-theme/unauthenticated/iframe-styles.css
new file mode 100644
index 000000000..bef603359
--- /dev/null
+++ b/gray-theme/unauthenticated/iframe-styles.css
@@ -0,0 +1,13 @@
+body:not([style]) {
+ font: 14px/1.231 arial, helvetica, clean, sans-serif;
+}
+
+p:not([style]) {
+ margin: 0;
+}
+
+blockquote:not([style]) {
+ margin: 0px 0px 0px 0.8ex;
+ border-left: 1px solid #ccc;
+ padding-left: 1ex;
+}
\ No newline at end of file
diff --git a/mailboxes/folders-lib.pl b/mailboxes/folders-lib.pl
index 5d5ab1c0d..470fa9ef3 100755
--- a/mailboxes/folders-lib.pl
+++ b/mailboxes/folders-lib.pl
@@ -2847,18 +2847,12 @@ sub iframe_body
my ($body) = @_;
# Mail iframe inner styles
-my $iframe_styles =
- '';
+my $iframe_styles = <
+ html, body { overflow-y: hidden; }
+ @{[&read_file_contents("$root_directory/$current_theme/unauthenticated/iframe-styles.css")]}
+
+EOF
# Add inner styles to the email body
if ($body =~ /<\/body>/) {
$body =~ s/<\/body>/$iframe_styles<\/body>/;