From cb6e110f4021afc96f308cabae7c02fa13cf682e Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Mon, 29 May 2023 23:29:18 +0300
Subject: [PATCH 01/22] Fix not to remove images completely, as we can border
 them nicely

---
 mailboxes/folders-lib.pl | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/mailboxes/folders-lib.pl b/mailboxes/folders-lib.pl
index 56ea1f4c4..f2adf2ec7 100755
--- a/mailboxes/folders-lib.pl
+++ b/mailboxes/folders-lib.pl
@@ -2768,10 +2768,11 @@ else {
 # 2=All images. Returns the URL of images found in &urls
 sub disable_html_images
 {
-local ($html, $dis, $urls) = @_;
-local $newhtml;
+my ($html, $dis, $urls) = @_;
+my $newhtml;
+my $masked_img;
 while($html =~ /^([\000-\377]*?)(<\s*img[^>]*src=('[^']*'|"[^"]*"|\S+)[^>]*>)([\000-\377]*)/i) {
-	local ($before, $allimg, $img, $after) = ($1, $2, $3, $4);
+	my ($before, $allimg, $img, $after) = ($1, $2, $3, $4);
 	$img =~ s/^'(.*)'$/$1/ || $img =~ s/^"(.*)"$/$1/;
 	push(@$urls, $img) if ($urls);
 	if ($dis == 0) {
@@ -2781,7 +2782,10 @@ while($html =~ /^([\000-\377]*?)(<\s*img[^>]*src=('[^']*'|"[^"]*"|\S+)[^>]*>)([\
 	elsif ($dis == 1) {
 		# Don't touch unless offsite
 		if ($img =~ /^(http|https|ftp):/) {
-			$newhtml .= $before;
+			$masked_img++;
+			my $imgcont = $allimg;
+			$imgcont =~ s/src=/data-nosrc=/g;
+			$newhtml .= $before.$imgcont;
 			}
 		else {
 			$newhtml .= $before.$allimg;
@@ -2794,6 +2798,25 @@ while($html =~ /^([\000-\377]*?)(<\s*img[^>]*src=('[^']*'|"[^"]*"|\S+)[^>]*>)([\
 	$html = $after;
 	}
 $newhtml .= $html;
+if ($masked_img) {
+	my $masked_img_style =
+	  "<style>".
+	    "img[data-nosrc]
+	      { 
+	      	box-shadow: 0 0 0 1px #e153614f !important;
+	      	border-radius: 0 !important;
+	      	background: #e153614f !important;
+	      }".
+	  "</style>";
+	$masked_img_style =~ s/[\n\r\s]+/ /g;
+	$masked_img_style = &trim($masked_img_style);
+	if ($newhtml =~ /<\/body>/) {
+		$newhtml =~ s/<\/body>/$masked_img_style<\/body>/;
+		}
+	else {
+		$newhtml .= $masked_img_style;
+		}
+	}
 return $newhtml;
 }
 

From 8319033bfa6c7767668bdbcf618592c0fdd8d65a Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Mon, 29 May 2023 23:30:02 +0300
Subject: [PATCH 02/22] Add API to put HTML email body to `iframe` element

---
 mailboxes/folders-lib.pl | 51 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/mailboxes/folders-lib.pl b/mailboxes/folders-lib.pl
index f2adf2ec7..4fe15c525 100755
--- a/mailboxes/folders-lib.pl
+++ b/mailboxes/folders-lib.pl
@@ -2820,6 +2820,57 @@ if ($masked_img) {
 return $newhtml;
 }
 
+# iframe_body(body)
+# Returns email message in an iframe HTML element
+sub iframe_body
+{
+my ($body) = @_;
+my $iframe_styles =
+  "<style>".
+   "html,body { overflow-y: hidden; }".
+  "</style>";
+my $iframe_spinner =
+  "<div id='iframe-spinner'></div>".
+  "<style>".
+   "
+     \@keyframes iframe-spinner {
+       to {transform: rotate(360deg);}
+     }
+ 
+     #iframe-spinner:before {
+       animation: iframe-spinner .4s linear infinite;
+       border-radius: 50%;
+       border: 2px solid #bbbbbb;
+       border-top-color: #000000;
+       box-sizing: border-box;
+       content: '';
+       height: 18px;
+       margin-top: 3px;
+       position: absolute;
+       right: 15px;
+       width: 18px;
+     }
+  ".
+  "</style>";
+$iframe_styles =~ s/[\n\r\s]+/ /g;
+$iframe_styles = &trim($iframe_styles);
+if ($body =~ /<\/body>/) {
+		$body =~ s/<\/body>/$iframe_styles<\/body>/;
+		}
+	else {
+		$body .= $iframe_styles;
+		}
+$body = &trim(&quote_escape($body, '"'));
+my $iframe_body = $iframe_spinner.
+      "<iframe id='mail-iframe' style='border:0; width:100%; min-height:50vh;'  
+         onload='this.style.height=this.contentWindow.document.body.getBoundingClientRect().bottom +
+                 this.contentWindow.document.body.getBoundingClientRect().top + \"px\";
+                   this.previousElementSibling.remove();this.classList.add(\"loaded\")' 
+         src=\"about:blank\" srcdoc=\"$body\"".
+      "></iframe>";
+return &trim($iframe_body);
+}
+
 # remove_body_attachments(&mail, &attach)
 # Returns attachments except for those that make up the message body, and those
 # that have sub-attachments.

From 76bf9ffd623fd960f380a3c06de82680dc922163 Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Mon, 29 May 2023 23:59:05 +0300
Subject: [PATCH 03/22] Add to use a new `iframe_body` API

---
 mailboxes/view_mail.cgi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mailboxes/view_mail.cgi b/mailboxes/view_mail.cgi
index 0729d856d..7f782909d 100755
--- a/mailboxes/view_mail.cgi
+++ b/mailboxes/view_mail.cgi
@@ -161,7 +161,7 @@ if ($body && $body->{'data'} =~ /\S/) {
 		}
 	elsif ($body eq $htmlbody) {
 		# Attempt to show HTML
-		$bodycontents = &safe_html($body->{'data'});
+		$bodycontents = $body->{'data'};
 		$bodycontents = &fix_cids($bodycontents, \@attach,
 			"detach.cgi?user=$uuser&idx=$in{'idx'}&folder=$in{'folder'}$subs");
 		if ($textbody) {
@@ -169,6 +169,8 @@ if ($body && $body->{'data'} =~ /\S/) {
 			    "<a href='$hbase&body=1'>$text{'view_astext'}</a>");
 			}
 		}
+		$bodycontents = &iframe_body($bodycontents)
+			if ($bodycontents);
 	}
 if ($bodycontents) {
 	print &ui_table_start($text{'view_body'}, "width=100%", 1,

From 93cc86315d173a59efeb1f1f2f5b23d12db321ba Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Tue, 30 May 2023 00:36:36 +0300
Subject: [PATCH 04/22] Add better indications for hidden images

---
 mailboxes/folders-lib.pl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mailboxes/folders-lib.pl b/mailboxes/folders-lib.pl
index 4fe15c525..8777903ab 100755
--- a/mailboxes/folders-lib.pl
+++ b/mailboxes/folders-lib.pl
@@ -2803,9 +2803,12 @@ if ($masked_img) {
 	  "<style>".
 	    "img[data-nosrc]
 	      { 
-	      	box-shadow: 0 0 0 1px #e153614f !important;
 	      	border-radius: 0 !important;
-	      	background: #e153614f !important;
+	      	background: #e1567833 !important;
+	      	border-color: transparent !important;
+	      	min-width: 16px;
+	      	min-height: 16px;
+	      	}
 	      }".
 	  "</style>";
 	$masked_img_style =~ s/[\n\r\s]+/ /g;

From 121cbc4a959e58971517dceba0382894a23c9119 Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Tue, 30 May 2023 00:37:20 +0300
Subject: [PATCH 05/22] Add a button to display images on demand (not allow by
 default)

---
 mailboxes/view_mail.cgi | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/mailboxes/view_mail.cgi b/mailboxes/view_mail.cgi
index 7f782909d..0d57c2844 100755
--- a/mailboxes/view_mail.cgi
+++ b/mailboxes/view_mail.cgi
@@ -162,12 +162,19 @@ if ($body && $body->{'data'} =~ /\S/) {
 	elsif ($body eq $htmlbody) {
 		# Attempt to show HTML
 		$bodycontents = $body->{'data'};
+		my @imageurls;
+		my $image_mode = defined($in{'images'}) ? $in{'images'} : 1;
+		$bodycontents = &disable_html_images($bodycontents, $image_mode, \@imageurls);
 		$bodycontents = &fix_cids($bodycontents, \@attach,
 			"detach.cgi?user=$uuser&idx=$in{'idx'}&folder=$in{'folder'}$subs");
 		if ($textbody) {
 			push(@bodyright,
 			    "<a href='$hbase&body=1'>$text{'view_astext'}</a>");
 			}
+		if (@imageurls && $image_mode) {
+			# Link to show images
+			push(@bodyright, "<a href='$hbase&body=$in{'body'}&headers=$in{'headers'}&images=0'>$text{'view_images'}</a>");
+			}
 		}
 		$bodycontents = &iframe_body($bodycontents)
 			if ($bodycontents);

From 1f339f208583757c818cd09a9ee2ae78c3fd3fc7 Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Tue, 30 May 2023 11:48:14 +0300
Subject: [PATCH 06/22] Fix to always `sandbox` email content

---
 mailboxes/folders-lib.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mailboxes/folders-lib.pl b/mailboxes/folders-lib.pl
index 8777903ab..afc000059 100755
--- a/mailboxes/folders-lib.pl
+++ b/mailboxes/folders-lib.pl
@@ -2865,7 +2865,7 @@ if ($body =~ /<\/body>/) {
 		}
 $body = &trim(&quote_escape($body, '"'));
 my $iframe_body = $iframe_spinner.
-      "<iframe id='mail-iframe' style='border:0; width:100%; min-height:50vh;'  
+      "<iframe sandbox id='mail-iframe' style='border:0; width:100%; min-height:50vh;'  
          onload='this.style.height=this.contentWindow.document.body.getBoundingClientRect().bottom +
                  this.contentWindow.document.body.getBoundingClientRect().top + \"px\";
                    this.previousElementSibling.remove();this.classList.add(\"loaded\")' 

From 8cd0b8ab49a2e5ac8451f686f58f300c7b99c0a3 Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Tue, 30 May 2023 12:46:17 +0300
Subject: [PATCH 07/22] Fix to allow `allow-same-origin` and
 `allow-popups-to-escape-sandbox`

---
 mailboxes/folders-lib.pl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mailboxes/folders-lib.pl b/mailboxes/folders-lib.pl
index afc000059..c5daacdc7 100755
--- a/mailboxes/folders-lib.pl
+++ b/mailboxes/folders-lib.pl
@@ -2865,7 +2865,9 @@ if ($body =~ /<\/body>/) {
 		}
 $body = &trim(&quote_escape($body, '"'));
 my $iframe_body = $iframe_spinner.
-      "<iframe sandbox id='mail-iframe' style='border:0; width:100%; min-height:50vh;'  
+      "<iframe
+         sandbox='allow-same-origin allow-popups-to-escape-sandbox'
+         id='mail-iframe' style='border:0; width:100%; min-height:50vh;'  
          onload='this.style.height=this.contentWindow.document.body.getBoundingClientRect().bottom +
                  this.contentWindow.document.body.getBoundingClientRect().top + \"px\";
                    this.previousElementSibling.remove();this.classList.add(\"loaded\")' 

From 9e714d7f5764087333502e2bda78453ad488d1f8 Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Tue, 30 May 2023 13:16:18 +0300
Subject: [PATCH 08/22] Fix to use a function call for `onload` event in mail
 `iframe`

---
 mailboxes/folders-lib.pl | 49 ++++++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/mailboxes/folders-lib.pl b/mailboxes/folders-lib.pl
index c5daacdc7..bac06f605 100755
--- a/mailboxes/folders-lib.pl
+++ b/mailboxes/folders-lib.pl
@@ -2829,17 +2829,17 @@ sub iframe_body
 {
 my ($body) = @_;
 my $iframe_styles =
-  "<style>".
-   "html,body { overflow-y: hidden; }".
-  "</style>";
+  "<style>
+    html,body { overflow-y: hidden; }
+   </style>";
 my $iframe_spinner =
-  "<div id='iframe-spinner'></div>".
-  "<style>".
-   "
+  "<div id='iframe-spinner'></div>
+   <style>
      \@keyframes iframe-spinner {
-       to {transform: rotate(360deg);}
+       to {
+         transform: rotate(360deg);
+       }
      }
- 
      #iframe-spinner:before {
        animation: iframe-spinner .4s linear infinite;
        border-radius: 50%;
@@ -2853,8 +2853,8 @@ my $iframe_spinner =
        right: 15px;
        width: 18px;
      }
-  ".
-  "</style>";
+   </style>
+  ";
 $iframe_styles =~ s/[\n\r\s]+/ /g;
 $iframe_styles = &trim($iframe_styles);
 if ($body =~ /<\/body>/) {
@@ -2864,15 +2864,26 @@ if ($body =~ /<\/body>/) {
 		$body .= $iframe_styles;
 		}
 $body = &trim(&quote_escape($body, '"'));
-my $iframe_body = $iframe_spinner.
-      "<iframe
-         sandbox='allow-same-origin allow-popups-to-escape-sandbox'
-         id='mail-iframe' style='border:0; width:100%; min-height:50vh;'  
-         onload='this.style.height=this.contentWindow.document.body.getBoundingClientRect().bottom +
-                 this.contentWindow.document.body.getBoundingClientRect().top + \"px\";
-                   this.previousElementSibling.remove();this.classList.add(\"loaded\")' 
-         src=\"about:blank\" srcdoc=\"$body\"".
-      "></iframe>";
+my $iframe_body =
+  $iframe_spinner."
+  <script>
+  function mail_iframe_onload(iframe) {
+    if (typeof theme_mail_iframe_onload === 'function') {
+        theme_mail_iframe_onload(iframe);
+          return;
+    }
+    const iframe_spinner = document.querySelector('#iframe-spinner');
+    iframe.style.height=Math.ceil(iframe.contentWindow.document.body.scrollHeight * 1.002) + \"px\";
+    iframe_spinner && iframe_spinner.remove();
+    iframe.classList.add(\"loaded\");
+  }
+  </script>
+  <iframe
+     sandbox='allow-same-origin allow-popups allow-popups-to-escape-sandbox' 
+     id='mail-iframe' style='border:0; width:100%;'  
+     onload='mail_iframe_onload(this)' 
+     src=\"about:blank\" srcdoc=\"$body\"".
+  "></iframe>";
 return &trim($iframe_body);
 }
 

From 3f470a4bcd26bb6ee97fc9ef4b3fec373d4d2a2f Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Tue, 30 May 2023 13:48:39 +0300
Subject: [PATCH 09/22] Fix to use more common `here-doc` to print multiline

---
 mailboxes/folders-lib.pl | 89 ++++++++++++++++++----------------------
 1 file changed, 41 insertions(+), 48 deletions(-)

diff --git a/mailboxes/folders-lib.pl b/mailboxes/folders-lib.pl
index bac06f605..85ecb97d4 100755
--- a/mailboxes/folders-lib.pl
+++ b/mailboxes/folders-lib.pl
@@ -2828,35 +2828,11 @@ return $newhtml;
 sub iframe_body
 {
 my ($body) = @_;
+
+# Mail iframe inner styles
 my $iframe_styles =
-  "<style>
-    html,body { overflow-y: hidden; }
-   </style>";
-my $iframe_spinner =
-  "<div id='iframe-spinner'></div>
-   <style>
-     \@keyframes iframe-spinner {
-       to {
-         transform: rotate(360deg);
-       }
-     }
-     #iframe-spinner:before {
-       animation: iframe-spinner .4s linear infinite;
-       border-radius: 50%;
-       border: 2px solid #bbbbbb;
-       border-top-color: #000000;
-       box-sizing: border-box;
-       content: '';
-       height: 18px;
-       margin-top: 3px;
-       position: absolute;
-       right: 15px;
-       width: 18px;
-     }
-   </style>
-  ";
-$iframe_styles =~ s/[\n\r\s]+/ /g;
-$iframe_styles = &trim($iframe_styles);
+	'<style>html,body { overflow-y: hidden; }</style>';
+# Add inner styles to the email body
 if ($body =~ /<\/body>/) {
 		$body =~ s/<\/body>/$iframe_styles<\/body>/;
 		}
@@ -2864,26 +2840,43 @@ if ($body =~ /<\/body>/) {
 		$body .= $iframe_styles;
 		}
 $body = &trim(&quote_escape($body, '"'));
-my $iframe_body =
-  $iframe_spinner."
-  <script>
-  function mail_iframe_onload(iframe) {
-    if (typeof theme_mail_iframe_onload === 'function') {
-        theme_mail_iframe_onload(iframe);
-          return;
-    }
-    const iframe_spinner = document.querySelector('#iframe-spinner');
-    iframe.style.height=Math.ceil(iframe.contentWindow.document.body.scrollHeight * 1.002) + \"px\";
-    iframe_spinner && iframe_spinner.remove();
-    iframe.classList.add(\"loaded\");
-  }
-  </script>
-  <iframe
-     sandbox='allow-same-origin allow-popups allow-popups-to-escape-sandbox' 
-     id='mail-iframe' style='border:0; width:100%;'  
-     onload='mail_iframe_onload(this)' 
-     src=\"about:blank\" srcdoc=\"$body\"".
-  "></iframe>";
+# Email iframe stuff
+my $iframe_body = <<EOF
+<div id="iframe-spinner"></div>
+<style>
+	@keyframes iframe-spinner {
+		to {
+			transform: rotate(360deg);
+			}
+	}
+	#iframe-spinner:before {
+		animation: iframe-spinner .4s linear infinite;
+		border-radius: 50%;
+		border: 2px solid #bbbbbb;
+		border-top-color: #000000;
+		box-sizing: border-box;
+		content: '';
+		height: 18px;
+		margin-top: 3px;
+		position: absolute;
+		right: 15px;
+		width: 18px;
+	}
+</style>
+<script>
+	function mail_iframe_onload(iframe) {
+		if (typeof theme_mail_iframe_onload === 'function') {
+		    theme_mail_iframe_onload(iframe);
+		      return;
+		}
+		const iframe_spinner = document.querySelector('#iframe-spinner');
+		iframe.style.height = Math.ceil(iframe.contentWindow.document.body.scrollHeight * 1.002) + "px";
+		iframe_spinner && iframe_spinner.remove();
+		iframe.classList.add("loaded");
+	}
+</script>
+<iframe sandbox="allow-same-origin allow-popups allow-popups-to-escape-sandbox" id="mail-iframe" style="border:0; width:100%;" onload="mail_iframe_onload(this)" src="about:blank" srcdoc="$body"></iframe>
+EOF
 return &trim($iframe_body);
 }
 

From d6e21f43ce78df3f00c59fc65a0b79c53cc1b799 Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Tue, 30 May 2023 13:52:05 +0300
Subject: [PATCH 10/22] Fix missing semicolon

---
 mailboxes/folders-lib.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mailboxes/folders-lib.pl b/mailboxes/folders-lib.pl
index 85ecb97d4..c4d39e199 100755
--- a/mailboxes/folders-lib.pl
+++ b/mailboxes/folders-lib.pl
@@ -2841,7 +2841,7 @@ if ($body =~ /<\/body>/) {
 		}
 $body = &trim(&quote_escape($body, '"'));
 # Email iframe stuff
-my $iframe_body = <<EOF
+my $iframe_body = <<EOF;
 <div id="iframe-spinner"></div>
 <style>
 	@keyframes iframe-spinner {
@@ -2877,6 +2877,7 @@ my $iframe_body = <<EOF
 </script>
 <iframe sandbox="allow-same-origin allow-popups allow-popups-to-escape-sandbox" id="mail-iframe" style="border:0; width:100%;" onload="mail_iframe_onload(this)" src="about:blank" srcdoc="$body"></iframe>
 EOF
+
 return &trim($iframe_body);
 }
 

From 185d2b546e1321694454d244f4b69a7b2010e784 Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Tue, 30 May 2023 13:53:21 +0300
Subject: [PATCH 11/22] Fix not to use inline styling

---
 mailboxes/folders-lib.pl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mailboxes/folders-lib.pl b/mailboxes/folders-lib.pl
index c4d39e199..76fb13138 100755
--- a/mailboxes/folders-lib.pl
+++ b/mailboxes/folders-lib.pl
@@ -2844,6 +2844,10 @@ $body = &trim(&quote_escape($body, '"'));
 my $iframe_body = <<EOF;
 <div id="iframe-spinner"></div>
 <style>
+	#mail-iframe {
+		border:0;
+		width:100%;
+	}
 	@keyframes iframe-spinner {
 		to {
 			transform: rotate(360deg);
@@ -2875,9 +2879,8 @@ my $iframe_body = <<EOF;
 		iframe.classList.add("loaded");
 	}
 </script>
-<iframe sandbox="allow-same-origin allow-popups allow-popups-to-escape-sandbox" id="mail-iframe" style="border:0; width:100%;" onload="mail_iframe_onload(this)" src="about:blank" srcdoc="$body"></iframe>
+<iframe sandbox="allow-same-origin allow-popups allow-popups-to-escape-sandbox" id="mail-iframe" onload="mail_iframe_onload(this)" src="about:blank" srcdoc="$body"></iframe>
 EOF
-
 return &trim($iframe_body);
 }
 

From ece9d2af52778dfb65fdb2b6e8f0448f7a603d4b Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Tue, 30 May 2023 13:54:27 +0300
Subject: [PATCH 12/22] Fix to make spinner name more precise

---
 mailboxes/folders-lib.pl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mailboxes/folders-lib.pl b/mailboxes/folders-lib.pl
index 76fb13138..e73354d73 100755
--- a/mailboxes/folders-lib.pl
+++ b/mailboxes/folders-lib.pl
@@ -2842,19 +2842,19 @@ if ($body =~ /<\/body>/) {
 $body = &trim(&quote_escape($body, '"'));
 # Email iframe stuff
 my $iframe_body = <<EOF;
-<div id="iframe-spinner"></div>
+<div id="mail-iframe-spinner"></div>
 <style>
 	#mail-iframe {
 		border:0;
 		width:100%;
 	}
-	@keyframes iframe-spinner {
+	@keyframes mail-iframe-spinner {
 		to {
 			transform: rotate(360deg);
 			}
 	}
-	#iframe-spinner:before {
-		animation: iframe-spinner .4s linear infinite;
+	#mail-iframe-spinner:before {
+		animation: mail-iframe-spinner .4s linear infinite;
 		border-radius: 50%;
 		border: 2px solid #bbbbbb;
 		border-top-color: #000000;
@@ -2873,7 +2873,7 @@ my $iframe_body = <<EOF;
 		    theme_mail_iframe_onload(iframe);
 		      return;
 		}
-		const iframe_spinner = document.querySelector('#iframe-spinner');
+		const iframe_spinner = document.querySelector('#mail-iframe-spinner');
 		iframe.style.height = Math.ceil(iframe.contentWindow.document.body.scrollHeight * 1.002) + "px";
 		iframe_spinner && iframe_spinner.remove();
 		iframe.classList.add("loaded");

From 8938680044ad50b18aa9b41aa188fcf9274aa715 Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Tue, 30 May 2023 13:57:23 +0300
Subject: [PATCH 13/22] Fix code readability

---
 mailboxes/folders-lib.pl | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/mailboxes/folders-lib.pl b/mailboxes/folders-lib.pl
index e73354d73..f5df6f22c 100755
--- a/mailboxes/folders-lib.pl
+++ b/mailboxes/folders-lib.pl
@@ -2874,12 +2874,18 @@ my $iframe_body = <<EOF;
 		      return;
 		}
 		const iframe_spinner = document.querySelector('#mail-iframe-spinner');
-		iframe.style.height = Math.ceil(iframe.contentWindow.document.body.scrollHeight * 1.002) + "px";
+		iframe.style.height =
+		  Math.ceil(iframe.contentWindow.document.body.scrollHeight * 1.002) + "px";
 		iframe_spinner && iframe_spinner.remove();
 		iframe.classList.add("loaded");
 	}
 </script>
-<iframe sandbox="allow-same-origin allow-popups allow-popups-to-escape-sandbox" id="mail-iframe" onload="mail_iframe_onload(this)" src="about:blank" srcdoc="$body"></iframe>
+<iframe
+  id="mail-iframe" 
+  onload="mail_iframe_onload(this)" 
+  sandbox="allow-same-origin allow-popups allow-popups-to-escape-sandbox"
+  src="about:blank" srcdoc="$body">
+</iframe>
 EOF
 return &trim($iframe_body);
 }

From 2e06ab94b68b55f28e4780db9a44f576f8f13761 Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Tue, 30 May 2023 14:28:05 +0300
Subject: [PATCH 14/22] Fix to use formal params in `html_to_text` sub

---
 mailboxes/folders-lib.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mailboxes/folders-lib.pl b/mailboxes/folders-lib.pl
index f5df6f22c..d44821ce8 100755
--- a/mailboxes/folders-lib.pl
+++ b/mailboxes/folders-lib.pl
@@ -2494,12 +2494,13 @@ return $rv;
 # Attempts to convert some HTML to text form
 sub html_to_text
 {
-local ($h2, $lynx);
+my ($html) = @_;
+my ($h2, $lynx);
 if (($h2 = &has_command("html2text")) || ($lynx = &has_command("lynx"))) {
 	# Can use a commonly available external program
 	local $temp = &transname().".html";
 	open(TEMP, ">", $temp);
-	print TEMP $_[0];
+	print TEMP $html;
 	close(TEMP);
 	open(OUT, ($lynx ? "$lynx -dump $temp" : "$h2 $temp")." 2>/dev/null |");
 	while(<OUT>) {
@@ -2521,7 +2522,6 @@ if (($h2 = &has_command("html2text")) || ($lynx = &has_command("lynx"))) {
 	}
 else {
 	# Do conversion manually :(
-	local $html = $_[0];
 	$html =~ s/\s+/ /g;
 	$html =~ s/<p>/\n\n/gi;
 	$html =~ s/<br>/\n/gi;

From 9296b12a715afecc53bc8905e2a5798168d1bb73 Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Tue, 30 May 2023 15:56:42 +0300
Subject: [PATCH 15/22] Fix to correctly convert UTF-8 emails

---
 mailboxes/folders-lib.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mailboxes/folders-lib.pl b/mailboxes/folders-lib.pl
index d44821ce8..0c5448792 100755
--- a/mailboxes/folders-lib.pl
+++ b/mailboxes/folders-lib.pl
@@ -2502,7 +2502,7 @@ if (($h2 = &has_command("html2text")) || ($lynx = &has_command("lynx"))) {
 	open(TEMP, ">", $temp);
 	print TEMP $html;
 	close(TEMP);
-	open(OUT, ($lynx ? "$lynx -dump $temp" : "$h2 $temp")." 2>/dev/null |");
+	open(OUT, ($lynx ? "$lynx --display_charset=utf-8 -dump $temp" : "$h2 $temp")." 2>/dev/null |");
 	while(<OUT>) {
 		if ($lynx && $_ =~ /^\s*References\s*$/) {
 			# Start of Lynx references output

From 62d3c08fbda8261fc2bc1af2748a6545771244f6 Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Tue, 30 May 2023 16:26:56 +0300
Subject: [PATCH 16/22] Add to use Perl HTML formatter if available

---
 mailboxes/folders-lib.pl | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/mailboxes/folders-lib.pl b/mailboxes/folders-lib.pl
index 0c5448792..348c0737e 100755
--- a/mailboxes/folders-lib.pl
+++ b/mailboxes/folders-lib.pl
@@ -2521,6 +2521,21 @@ if (($h2 = &has_command("html2text")) || ($lynx = &has_command("lynx"))) {
 	return $text;
 	}
 else {
+	# Can we use Perl HTML formatter
+	# for the better conversion
+	eval "use HTML::TreeBuilder";
+	if (!$@) {
+		eval "use HTML::FormatText";
+		if (!$@) {
+			my $html_parser = HTML::TreeBuilder->new();
+			eval "use utf8";
+			utf8::decode($html)
+				if (!$@);
+			$html_parser->parse($html);
+			my $formatter = HTML::FormatText->new(leftmargin => 1, rightmargin => 79);
+			return $formatter->format($html_parser);
+			}
+		}
 	# Do conversion manually :(
 	$html =~ s/\s+/ /g;
 	$html =~ s/<p>/\n\n/gi;

From f7a13c9f9eb6e1ea4af2cc015d651984fd6fdcc1 Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Tue, 30 May 2023 16:28:33 +0300
Subject: [PATCH 17/22] Fix to Recommend: `lynx` as it still produces the best
 results

---
 makedebian.pl | 2 +-
 makerpm.pl    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/makedebian.pl b/makedebian.pl
index 92b8fb4b1..1a8c37c3b 100755
--- a/makedebian.pl
+++ b/makedebian.pl
@@ -107,7 +107,7 @@ if ($product eq "webmin") {
 $size = int(`du -sk $tmp_dir`);
 @deps = ( "perl", "libnet-ssleay-perl", "openssl", "libauthen-pam-perl", "libpam-runtime", "libio-pty-perl", "unzip", "shared-mime-info", "tar", "libdigest-sha-perl", "libdigest-md5-perl" );
 $deps = join(", ", @deps);
-@recommends = ( "libdatetime-perl", "libdatetime-timezone-perl", "libdatetime-locale-perl", "libtime-piece-perl" );
+@recommends = ( "libdatetime-perl", "libdatetime-timezone-perl", "libdatetime-locale-perl", "libtime-piece-perl", "lynx" );
 $recommends = join(", ", @recommends);
 open(CONTROL, ">$control_file");
 print CONTROL <<EOF;
diff --git a/makerpm.pl b/makerpm.pl
index f390bda72..69abb2ed4 100755
--- a/makerpm.pl
+++ b/makerpm.pl
@@ -87,7 +87,7 @@ Release: $rel
 Provides: %{name}-%{version} perl(WebminCore)
 Requires(pre): /usr/bin/perl
 Requires: /bin/sh /usr/bin/perl /bin/rm perl(lib) perl(open) perl(Net::SSLeay) perl(Time::Local) perl(Encode::Detect) perl(Data::Dumper) perl(File::Path) perl(File::Basename) perl(Digest::SHA) perl(Digest::MD5) openssl unzip tar
-Recommends: perl(DateTime) perl(DateTime::TimeZone) perl(DateTime::Locale) perl(Time::Piece)
+Recommends: perl(DateTime) perl(DateTime::TimeZone) perl(DateTime::Locale) perl(Time::Piece) lynx
 AutoReq: 0
 License: BSD-3-clause
 Group: System/Tools

From 349a1f5873e7ff64a2ee35c23870d7613d31189b Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Tue, 30 May 2023 16:48:35 +0300
Subject: [PATCH 18/22] Fix to fully strip `<style>` and `<script>` tags
 content (not text data)

---
 mailboxes/folders-lib.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mailboxes/folders-lib.pl b/mailboxes/folders-lib.pl
index 348c0737e..0b94fb0e2 100755
--- a/mailboxes/folders-lib.pl
+++ b/mailboxes/folders-lib.pl
@@ -2537,6 +2537,7 @@ else {
 			}
 		}
 	# Do conversion manually :(
+	$html =~ s/(<|&lt;)(style|script).*?(>|&gt;).*?(<|&lt;)\/(style|script)(>|&gt;)//gs;
 	$html =~ s/\s+/ /g;
 	$html =~ s/<p>/\n\n/gi;
 	$html =~ s/<br>/\n/gi;

From e7a769ccf82bf072243044631766fa93ba7fa182 Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Tue, 30 May 2023 16:55:51 +0300
Subject: [PATCH 19/22] =?UTF-8?q?Fix=20not=20to=20replace=20on=20UTF-8=20s?=
 =?UTF-8?q?tring=20to=20avoid=20encoding=20issues=20(e.g.=20=EF=BF=BD)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mailboxes/folders-lib.pl | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/mailboxes/folders-lib.pl b/mailboxes/folders-lib.pl
index 0b94fb0e2..ec9995569 100755
--- a/mailboxes/folders-lib.pl
+++ b/mailboxes/folders-lib.pl
@@ -2542,7 +2542,14 @@ else {
 	$html =~ s/<p>/\n\n/gi;
 	$html =~ s/<br>/\n/gi;
 	$html =~ s/<[^>]+>//g;
+	my $useutf8 = 0;
+	eval "use utf8";
+	$useutf8 = 1 if (!$@);
+	utf8::decode($html)
+		if ($useutf8);
 	$html = &entities_to_ascii($html);
+	utf8::encode($html)
+		if ($useutf8);
 	return $html;
 	}
 }

From adbd30bacc8788bdda812cec2852d5f46c59e813 Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Tue, 30 May 2023 22:02:51 +0300
Subject: [PATCH 20/22] Fix to switch default view mode to HTML/plaintext

---
 mailboxes/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mailboxes/config b/mailboxes/config
index 3d1ea4a97..14ee28452 100644
--- a/mailboxes/config
+++ b/mailboxes/config
@@ -15,7 +15,7 @@ sort_mode=1
 fwd_mode=0
 delete_warn=y
 top_buttons=2
-view_html=0
+view_html=2
 mail_usermin=mail
 sync_create=0
 sync_modify=1

From 87c087dda96bb3c18dd9c8c057b712225b12036f Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Wed, 31 May 2023 15:35:42 +0300
Subject: [PATCH 21/22] Fix to literalize @

---
 mailboxes/folders-lib.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mailboxes/folders-lib.pl b/mailboxes/folders-lib.pl
index ec9995569..9d51d9b04 100755
--- a/mailboxes/folders-lib.pl
+++ b/mailboxes/folders-lib.pl
@@ -2871,7 +2871,7 @@ my $iframe_body = <<EOF;
 		border:0;
 		width:100%;
 	}
-	@keyframes mail-iframe-spinner {
+	\@keyframes mail-iframe-spinner {
 		to {
 			transform: rotate(360deg);
 			}

From 11e3fcc3a6db4f2f1c6c78200af5112734a876bb Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Wed, 31 May 2023 16:13:08 +0300
Subject: [PATCH 22/22] Fix `iframe` height calculations

---
 mailboxes/folders-lib.pl | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/mailboxes/folders-lib.pl b/mailboxes/folders-lib.pl
index 9d51d9b04..55d4c197d 100755
--- a/mailboxes/folders-lib.pl
+++ b/mailboxes/folders-lib.pl
@@ -2896,9 +2896,13 @@ my $iframe_body = <<EOF;
 		    theme_mail_iframe_onload(iframe);
 		      return;
 		}
-		const iframe_spinner = document.querySelector('#mail-iframe-spinner');
-		iframe.style.height =
-		  Math.ceil(iframe.contentWindow.document.body.scrollHeight * 1.002) + "px";
+		const iframe_spinner = document.querySelector('#mail-iframe-spinner'),
+		      iframe_height_bound = iframe.contentWindow.document.body.getBoundingClientRect().bottom,
+		      iframe_scroll_height = iframe.contentWindow.document.body.scrollHeight,
+		      iframe_height =
+		      	iframe_height_bound > iframe_scroll_height ?
+		      		iframe_height_bound : iframe_scroll_height;
+		iframe.style.height = Math.ceil(iframe_height) + "px";
 		iframe_spinner && iframe_spinner.remove();
 		iframe.classList.add("loaded");
 	}