From 68b547d55a17f2ed11d0ed7dedda797f100a0cbe Mon Sep 17 00:00:00 2001
From: Ilia Ross <ilia@ross.gdn>
Date: Tue, 28 May 2024 16:56:23 +0300
Subject: [PATCH] Fix to include forwarded message on empty body

https://github.com/webmin/webmin/commit/a2683735509c7fceb414fd92bdb30e79dccb3bc0#r142447419

[build]
---
 html-editor-lib.pl       | 7 +++++++
 mailboxes/folders-lib.pl | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/html-editor-lib.pl b/html-editor-lib.pl
index 1b4e4b4fd..94c85cf5d 100644
--- a/html-editor-lib.pl
+++ b/html-editor-lib.pl
@@ -245,6 +245,11 @@ $navigation_type ||= 'reload';
 my $html_editor_init_script =
 <<EOF;
 <script type="text/javascript">
+  function fn_${module_name}_quote_mail_iframe_loaded() {
+    const editor = fn_${module_name}_html_editor_init.editor;
+    editor.root.innerHTML = "\\n" + editor.root.innerHTML;
+    fn_${module_name}_quote_mail_iframe_loaded = null;
+  }
   function fn_${module_name}_html_editor_init() {
     const targ = document.querySelector('[$target_attr$target_type"$target_name"]'),
       qs = Quill.import('attributors/style/size'),
@@ -277,6 +282,8 @@ my $html_editor_init_script =
         theme: 'snow'
     });
 
+    fn_${module_name}_html_editor_init.editor = editor;
+
     // Google Mail like key bind for creating numbered list (Ctrl+Shift+7)
     editor.keyboard.addBinding({
         key: '7',
diff --git a/mailboxes/folders-lib.pl b/mailboxes/folders-lib.pl
index 1e59c8e6a..aebf0e754 100755
--- a/mailboxes/folders-lib.pl
+++ b/mailboxes/folders-lib.pl
@@ -3091,6 +3091,9 @@ my $iframe_body = <<EOF;
 </style>
 <script>
 	function quote_mail_iframe_onload(iframe) {
+		if (typeof fn_${module_name}_quote_mail_iframe_loaded === 'function') {
+		    fn_${module_name}_quote_mail_iframe_loaded(iframe);
+		}
 		if (typeof theme_quote_mail_iframe_onload === 'function') {
 		    theme_quote_mail_iframe_onload(iframe);
 		      return;