From 8955bb77d8b5045f0618ffcfe92b44c7e795c2c2 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Tue, 3 Feb 2026 16:14:40 +0100
Subject: [PATCH 01/94] feat: Add signature to rich editor

---
 .../mail/ui/newMessage/NewMessageFragment.kt  | 83 ++++++++++---------
 .../mail/ui/newMessage/NewMessageViewModel.kt | 23 ++---
 .../infomaniak/mail/utils/MessageBodyUtils.kt |  1 +
 .../infomaniak/mail/utils/SignatureUtils.kt   |  4 +-
 .../main/res/layout/fragment_new_message.xml  | 33 +-------
 5 files changed, 60 insertions(+), 84 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 86559e0a00a..ac74931bddd 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -95,6 +95,7 @@ import com.infomaniak.mail.ui.newMessage.encryption.EncryptionViewModel
 import com.infomaniak.mail.utils.AccountUtils
 import com.infomaniak.mail.utils.HtmlUtils.processCids
 import com.infomaniak.mail.utils.JsoupParserUtil.jsoupParseWithLog
+import com.infomaniak.mail.utils.MessageBodyUtils
 import com.infomaniak.mail.utils.SentryDebug
 import com.infomaniak.mail.utils.SignatureUtils
 import com.infomaniak.mail.utils.UiUtils.PRIMARY_COLOR_CODE
@@ -129,6 +130,8 @@ import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
+import org.jsoup.Jsoup
+import org.jsoup.nodes.Document
 import splitties.experimental.ExperimentalSplittiesApi
 import java.util.Date
 import javax.inject.Inject
@@ -156,7 +159,6 @@ class NewMessageFragment : Fragment() {
     private var addressListPopupWindow: ListPopupWindow? = null
 
     private var quoteWebView: WebView? = null
-    private var signatureWebView: WebView? = null
 
     private val signatureAdapter = SignatureAdapter(::onSignatureClicked)
     private val attachmentAdapter inline get() = binding.attachmentsRecyclerView.adapter as AttachmentAdapter
@@ -232,7 +234,7 @@ class NewMessageFragment : Fragment() {
         observeAttachments()
         observeImportAttachmentsResult()
         observeBodyLoader()
-        observeUiSignature()
+        observeEditorInitialization()
         observeUiQuote()
         observeShimmering()
 
@@ -363,13 +365,9 @@ class NewMessageFragment : Fragment() {
 
     private fun setWebViewReference() {
         quoteWebView = binding.quoteWebView
-        signatureWebView = binding.signatureWebView
     }
 
     override fun onConfigurationChanged(newConfig: Configuration) {
-        newMessageViewModel.uiSignatureLiveData.value?.let { _ ->
-            binding.signatureWebView.reload()
-        }
         newMessageViewModel.uiQuoteLiveData.value?.let { _ ->
             binding.quoteWebView.reload()
         }
@@ -385,8 +383,6 @@ class NewMessageFragment : Fragment() {
         addressListPopupWindow = null
         quoteWebView?.destroyAndClearHistory()
         quoteWebView = null
-        signatureWebView?.destroyAndClearHistory()
-        signatureWebView = null
         TransitionManager.endTransitions(binding.root)
         super.onDestroyView()
         _binding = null
@@ -418,7 +414,6 @@ class NewMessageFragment : Fragment() {
         toolbar.setNavigationOnClickListener { activity?.onBackPressedDispatcher?.onBackPressed() }
         changeToolbarColorOnScroll(appBarLayout, compositionNestedScrollView)
 
-        signatureWebView.enableAlgorithmicDarkening(true)
         quoteWebView.enableAlgorithmicDarkening(true)
 
         attachmentsRecyclerView.adapter = AttachmentAdapter(
@@ -531,21 +526,6 @@ class NewMessageFragment : Fragment() {
 
     private fun configureUiWithDraftData(draft: Draft) = with(binding) {
 
-        // Signature
-        signatureWebView.apply {
-            settings.setupNewMessageWebViewSettings()
-            initWebViewClientAndBridge(
-                attachments = emptyList(),
-                messageUid = "SIGNATURE-${draft.messageUid}",
-                shouldLoadDistantResources = true,
-                navigateToNewMessageActivity = null,
-            )
-        }
-        removeSignature.setOnClickListener {
-            trackNewMessageEvent(MatomoName.DeleteSignature)
-            newMessageViewModel.uiSignatureLiveData.value = null
-        }
-
         // Quote
         quoteWebView.apply {
             settings.setupNewMessageWebViewSettings()
@@ -584,11 +564,6 @@ class NewMessageFragment : Fragment() {
         }
     }
 
-    private fun WebView.loadSignatureContent(html: String, webViewGroup: Group) {
-        val processedHtml = webViewUtils.processSignatureHtmlForDisplay(html, context.isNightModeEnabled())
-        loadProcessedContent(processedHtml, webViewGroup)
-    }
-
     private fun WebView.loadContent(html: String, webViewGroup: Group) {
         val processedHtml = webViewUtils.processHtmlForDisplay(html = html, isDisplayedInDarkMode = context.isNightModeEnabled())
         loadProcessedContent(processedHtml, webViewGroup)
@@ -632,8 +607,38 @@ class NewMessageFragment : Fragment() {
 
     private fun onSignatureClicked(signature: Signature) {
         trackNewMessageEvent(MatomoName.SwitchIdentity)
-        newMessageViewModel.fromLiveData.value = UiFrom(signature)
-        addressListPopupWindow?.dismiss()
+
+        binding.editorWebView.exportHtml { html ->
+            val oldSignature = newMessageViewModel.fromLiveData.value?.signature?.content
+
+            val bodyHtml = if (!oldSignature.isNullOrEmpty()) {
+                removeSignature(html)
+            } else {
+                html
+            }
+
+            newMessageViewModel.fromLiveData.value = UiFrom(signature)
+            addressListPopupWindow?.dismiss()
+
+            // Get the New Signature HTML
+            val newSignatureHtml = signature.content
+            val wrappedNewSignature =
+                if (signature.isDummy) "" else signatureUtils.encapsulateSignatureContentWithInfomaniakClass(newSignatureHtml)
+
+            // Combine: New Body + New Signature
+            val finalHtml = bodyHtml + wrappedNewSignature
+
+            // Update the Editor
+            newMessageViewModel.editorBodyInitializer.postValue(BodyContentPayload(finalHtml, BodyContentType.HTML_SANITIZED))
+        }
+    }
+
+    private fun removeSignature(html: String): String {
+        val doc: Document = Jsoup.parseBodyFragment(html).apply {
+            getElementById(MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_ID)?.remove()
+        }
+
+        return doc.html()
     }
 
     private fun updateSelectedSignatureInFromField(signature: Signature) {
@@ -663,9 +668,8 @@ class NewMessageFragment : Fragment() {
     }
 
     private fun observeFromData() = with(newMessageViewModel) {
-        fromLiveData.observe(viewLifecycleOwner) { (signature, shouldUpdateBodySignature) ->
+        fromLiveData.observe(viewLifecycleOwner) { (signature) ->
             updateSelectedSignatureInFromField(signature)
-            if (shouldUpdateBodySignature) updateBodySignature(signature)
             signatureAdapter.updateSelectedSignature(signature.id)
         }
     }
@@ -765,13 +769,12 @@ class NewMessageFragment : Fragment() {
         }
     }
 
-    private fun observeUiSignature() = with(binding) {
-        newMessageViewModel.uiSignatureLiveData.observe(viewLifecycleOwner) { signature ->
-            if (signature == null) {
-                signatureGroup.isGone = true
-            } else {
-                signatureWebView.loadSignatureContent(signature, signatureGroup)
-            }
+    private fun observeEditorInitialization() {
+        newMessageViewModel.editorBodyInitializer.observe(viewLifecycleOwner) { bodyPayload ->
+            if (bodyPayload.content.isEmpty()) return@observe
+
+            // This sets the combined Body + Signature
+            editorContentManager.setContent(binding.editorWebView, bodyPayload)
         }
     }
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index 93a7fccd522..0c3de8a731f 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -171,7 +171,6 @@ class NewMessageViewModel @Inject constructor(
     val ccLiveData = MutableLiveData<UiRecipients>()
     val bccLiveData = MutableLiveData<UiRecipients>()
     val attachmentsLiveData = MutableLiveData<List<Attachment>>()
-    val uiSignatureLiveData = MutableLiveData<String?>()
     val uiQuoteLiveData = MutableLiveData<String?>()
     inline val allRecipients get() = toLiveData.valueOrEmpty() + ccLiveData.valueOrEmpty() + bccLiveData.valueOrEmpty()
     //endregion
@@ -548,9 +547,19 @@ class NewMessageViewModel @Inject constructor(
 
         attachmentsLiveData.postValue(attachments)
 
+        val signatureHtml = draftSignature?.takeIf { !it.isDummy }?.content
+        val wrappedSignature = signatureHtml?.let { signatureUtils.encapsulateSignatureContentWithInfomaniakClass(it) }
+
+        initialBody = BodyContentPayload(
+            content = when {
+                initialBody.content.isNotEmpty() -> initialBody.content
+                wrappedSignature != null -> wrappedSignature
+                else -> ""
+            },
+            type = BodyContentType.HTML_UNSANITIZED
+        )
         editorBodyInitializer.postValue(initialBody)
 
-        uiSignatureLiveData.postValue(initialSignature)
         uiQuoteLiveData.postValue(initialQuote)
 
         if (cc.isNotEmpty() || bcc.isNotEmpty()) {
@@ -839,14 +848,6 @@ class NewMessageViewModel @Inject constructor(
         if (cc.isEmpty() && bcc.isEmpty()) otherRecipientsFieldsAreEmpty.value = true
     }
 
-    fun updateBodySignature(signature: Signature) {
-        uiSignatureLiveData.value = if (signature.isDummy) {
-            null
-        } else {
-            signatureUtils.encapsulateSignatureContentWithInfomaniakClass(signature.content)
-        }
-    }
-
     fun uploadAttachmentsToServer(uiAttachments: List<Attachment>) = viewModelScope.launch(ioDispatcher) {
         val localUuid = draftLocalUuid ?: return@launch
         val realm = mailboxContentRealm()
@@ -964,7 +965,7 @@ class NewMessageViewModel @Inject constructor(
 
         subject = subjectValue
 
-        body = uiBodyValue + (uiSignatureLiveData.value ?: "") + (uiQuoteLiveData.value ?: "")
+        body = uiBodyValue + (uiQuoteLiveData.value ?: "")
 
         /**
          * If we are opening for the 1st time an existing Draft created somewhere else
diff --git a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
index 85b9f1b2692..adca8484f76 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
@@ -35,6 +35,7 @@ object MessageBodyUtils {
     const val INFOMANIAK_SIGNATURE_HTML_CLASS_NAME = "editorUserSignature"
     const val INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME = "ik_mail_quote"
     const val INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME = "forwardContentMessage"
+    const val INFOMANIAK_SIGNATURE_HTML_ID = "ik-signature"
 
     private const val QUOTE_DETECTION_TIMEOUT = 1_500L
 
diff --git a/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt
index 3528eee9a84..1de9ccee433 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt
@@ -19,6 +19,8 @@ package com.infomaniak.mail.utils
 
 import android.content.Context
 import com.infomaniak.mail.R
+import com.infomaniak.mail.utils.MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_CLASS_NAME
+import com.infomaniak.mail.utils.MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_ID
 import com.infomaniak.mail.utils.extensions.loadCss
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -31,7 +33,7 @@ class SignatureUtils @Inject constructor(appContext: Context) {
     fun encapsulateSignatureContentWithInfomaniakClass(signatureContent: String): String {
         val verticalMarginsCss = signatureMargins
         val verticalMarginAttributes = extractAttributesFromMarginCss(verticalMarginsCss)
-        return """<div class="${MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_CLASS_NAME}" style="$verticalMarginAttributes">$signatureContent</div>"""
+        return """<div id="$INFOMANIAK_SIGNATURE_HTML_ID" class="$INFOMANIAK_SIGNATURE_HTML_CLASS_NAME" style="$verticalMarginAttributes">$signatureContent</div>"""
     }
 
     private fun extractAttributesFromMarginCss(verticalMarginsCss: String): String {
diff --git a/app/src/main/res/layout/fragment_new_message.xml b/app/src/main/res/layout/fragment_new_message.xml
index ea4ba1bde7c..de829f7493d 100644
--- a/app/src/main/res/layout/fragment_new_message.xml
+++ b/app/src/main/res/layout/fragment_new_message.xml
@@ -366,37 +366,6 @@
                             android:maxWidth="200dp" />
                     </LinearLayout>
 
-                    <!--This view is has exactly one line of text worth of negative top margin because the editor has the same
-                    amount of extra space as "bottom margin". This way the editor and the signature continue being aligned exactly
-                    how they will look like when the email is sent. The editor extra bottom margin is needed to display selection
-                    handles correctly-->
-                    <WebView
-                        android:id="@+id/signatureWebView"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="-16dp"
-                        android:layout_marginBottom="@dimen/marginStandardMedium"
-                        android:focusable="false"
-                        android:focusableInTouchMode="false"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/editorWebView"
-                        tools:layout_height="50dp" />
-
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/removeSignature"
-                        style="@style/IconButtonSmall"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="@dimen/marginStandardSmall"
-                        android:contentDescription="@string/contentDescriptionButtonDeleteSignature"
-                        android:minWidth="0dp"
-                        android:minHeight="0dp"
-                        app:icon="@drawable/ic_close_small"
-                        app:layout_constraintDimensionRatio="1"
-                        app:layout_constraintEnd_toEndOf="@id/signatureWebView"
-                        app:layout_constraintTop_toTopOf="@id/signatureWebView" />
-
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/removeQuote"
                         style="@style/IconButtonSmall"
@@ -409,7 +378,7 @@
                         app:icon="@drawable/ic_close_small"
                         app:layout_constraintDimensionRatio="1"
                         app:layout_constraintEnd_toEndOf="@id/quoteWebView"
-                        app:layout_constraintTop_toBottomOf="@id/signatureWebView" />
+                        app:layout_constraintTop_toBottomOf="@id/editorWebView" />
 
                     <WebView
                         android:id="@+id/quoteWebView"

From d2ed990234308ec04e6470785f0fbe8c310d4157 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Wed, 11 Feb 2026 11:47:55 +0100
Subject: [PATCH 02/94] feat: Add signature and quotes to richHtlmEditorWebView

---
 .../mail/ui/newMessage/BodyContentPayload.kt  |   8 +-
 .../mail/ui/newMessage/NewMessageFragment.kt  | 116 ++++++++----------
 .../mail/ui/newMessage/NewMessageViewModel.kt |  23 ++--
 .../infomaniak/mail/utils/MessageBodyUtils.kt |   1 +
 app/src/main/res/drawable/ic_more_horiz.xml   |  27 ++++
 .../main/res/layout/fragment_new_message.xml  |  33 +----
 app/src/main/res/raw/editor_style.css         |  11 ++
 7 files changed, 113 insertions(+), 106 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_more_horiz.xml

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt
index 88f29030fda..fef59904f97 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt
@@ -17,6 +17,8 @@
  */
 package com.infomaniak.mail.ui.newMessage
 
+import com.infomaniak.mail.utils.MessageBodyUtils.INFOMANIAK_BODY_HTML_ID
+
 /**
  * @param content The string representation of the body in either html or plain text format.
  * @param type The type of representation of [content]. Each type will lead to different processing of the content.
@@ -24,7 +26,11 @@ package com.infomaniak.mail.ui.newMessage
 data class BodyContentPayload(val content: String, val type: BodyContentType) {
 
     companion object {
-        fun emptyBody() = BodyContentPayload(content = "", type = BodyContentType.TEXT_PLAIN_WITHOUT_HTML)
+        fun emptyBody(placeHolderText: String) =
+            BodyContentPayload(
+                content = "<div id=$INFOMANIAK_BODY_HTML_ID><p class='placeholder'>$placeHolderText</p></div>",
+                type = BodyContentType.HTML_SANITIZED
+            )
     }
 }
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index ac74931bddd..3937f9cf030 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -21,7 +21,6 @@ package com.infomaniak.mail.ui.newMessage
 
 import android.annotation.SuppressLint
 import android.app.Activity
-import android.content.ClipDescription
 import android.content.Intent
 import android.content.res.Configuration
 import android.os.Bundle
@@ -31,13 +30,11 @@ import android.transition.TransitionManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.webkit.WebView
 import android.widget.ListPopupWindow
 import android.widget.PopupWindow
 import androidx.activity.addCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.content.res.AppCompatResources
-import androidx.constraintlayout.widget.Group
 import androidx.core.view.forEach
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
@@ -56,6 +53,7 @@ import com.infomaniak.core.legacy.utils.SnackbarUtils.showSnackbar
 import com.infomaniak.core.legacy.utils.getBackNavigationResult
 import com.infomaniak.core.legacy.utils.setMargins
 import com.infomaniak.core.ui.showToast
+import com.infomaniak.lib.richhtmleditor.RichHtmlEditorWebView
 import com.infomaniak.lib.richhtmleditor.StatusCommand.BOLD
 import com.infomaniak.lib.richhtmleditor.StatusCommand.CREATE_LINK
 import com.infomaniak.lib.richhtmleditor.StatusCommand.ITALIC
@@ -93,13 +91,10 @@ import com.infomaniak.mail.ui.newMessage.NewMessageViewModel.UiFrom
 import com.infomaniak.mail.ui.newMessage.encryption.EncryptionMessageManager
 import com.infomaniak.mail.ui.newMessage.encryption.EncryptionViewModel
 import com.infomaniak.mail.utils.AccountUtils
-import com.infomaniak.mail.utils.HtmlUtils.processCids
-import com.infomaniak.mail.utils.JsoupParserUtil.jsoupParseWithLog
 import com.infomaniak.mail.utils.MessageBodyUtils
 import com.infomaniak.mail.utils.SentryDebug
 import com.infomaniak.mail.utils.SignatureUtils
 import com.infomaniak.mail.utils.UiUtils.PRIMARY_COLOR_CODE
-import com.infomaniak.mail.utils.Utils
 import com.infomaniak.mail.utils.WebViewUtils
 import com.infomaniak.mail.utils.WebViewUtils.Companion.destroyAndClearHistory
 import com.infomaniak.mail.utils.WebViewUtils.Companion.setupNewMessageWebViewSettings
@@ -125,10 +120,6 @@ import dagger.hilt.android.AndroidEntryPoint
 import io.sentry.Sentry
 import io.sentry.SentryLevel
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
@@ -151,6 +142,7 @@ class NewMessageFragment : Fragment() {
     private val newMessageViewModel: NewMessageViewModel by activityViewModels()
     private val aiViewModel: AiViewModel by activityViewModels()
     private val encryptionViewModel: EncryptionViewModel by activityViewModels()
+    private var hasPlaceholder = true
 
     private val filePicker = FilePicker(fragment = this).apply {
         initCallback { uris -> newMessageViewModel.importAttachmentsLiveData.value = uris }
@@ -158,7 +150,7 @@ class NewMessageFragment : Fragment() {
 
     private var addressListPopupWindow: ListPopupWindow? = null
 
-    private var quoteWebView: WebView? = null
+    private var quoteWebView: RichHtmlEditorWebView? = null
 
     private val signatureAdapter = SignatureAdapter(::onSignatureClicked)
     private val attachmentAdapter inline get() = binding.attachmentsRecyclerView.adapter as AttachmentAdapter
@@ -234,7 +226,6 @@ class NewMessageFragment : Fragment() {
         observeAttachments()
         observeImportAttachmentsResult()
         observeBodyLoader()
-        observeEditorInitialization()
         observeUiQuote()
         observeShimmering()
 
@@ -463,12 +454,16 @@ class NewMessageFragment : Fragment() {
     private fun initEditorUi() = with(binding) {
         editorWebView.subscribeToStates(setOf(BOLD, ITALIC, UNDERLINE, STRIKE_THROUGH, UNORDERED_LIST, CREATE_LINK))
         setEditorStyle()
-        handleEditorPlaceholderVisibility()
 
         editorAiAnimation.setAnimation(R.raw.euria)
-
         setToolbarEnabledStatus(false)
-        disableButtonsWhenFocusIsLost()
+        handleFocusChanges()
+    }
+
+    fun editorHasPlaceholder() = with(binding.editorWebView) {
+        exportHtml { html ->
+            hasPlaceholder = Jsoup.parseBodyFragment(html).getElementsByClass("placeholder").first() != null
+        }
     }
 
     private fun setEditorStyle() = with(binding.editorWebView) {
@@ -480,19 +475,28 @@ class NewMessageFragment : Fragment() {
         addCss(context.loadCss(R.raw.editor_style, customColors))
     }
 
-    private fun handleEditorPlaceholderVisibility() {
-        val isPlaceholderVisible = combine(
-            binding.editorWebView.isEmptyFlow.filterNotNull(),
-            newMessageViewModel.isShimmering,
-        ) { isEditorEmpty, isShimmering -> isEditorEmpty && !isShimmering }
+    private fun removePlaceholder() = with(binding.editorWebView) {
+        exportHtml { html ->
+            val doc: Document = Jsoup.parseBodyFragment(html).apply {
+                getElementsByClass("placeholder").first()?.text("")?.removeClass("placeholder")
+            }
 
-        isPlaceholderVisible
-            .onEach { isVisible -> binding.newMessagePlaceholder.isVisible = isVisible }
-            .launchIn(lifecycleScope)
+            newMessageViewModel.editorBodyInitializer.postValue(
+                BodyContentPayload(
+                    doc.html(),
+                    BodyContentType.HTML_SANITIZED
+                )
+            )
+        }
     }
 
-    private fun disableButtonsWhenFocusIsLost() {
-        newMessageViewModel.isEditorWebViewFocusedLiveData.observe(viewLifecycleOwner, ::setToolbarEnabledStatus)
+    private fun handleFocusChanges() {
+        newMessageViewModel.isEditorWebViewFocusedLiveData.observe(viewLifecycleOwner) { isFocused ->
+            setToolbarEnabledStatus(isFocused)
+            if (isFocused && hasPlaceholder) {
+                removePlaceholder()
+            }
+        }
     }
 
     private fun setToolbarEnabledStatus(isEnabled: Boolean) {
@@ -537,41 +541,18 @@ class NewMessageFragment : Fragment() {
                 navigateToNewMessageActivity = null,
             )
         }
+
         removeQuote.setOnClickListener {
             trackNewMessageEvent(MatomoName.DeleteQuote)
-            removeInlineAttachmentsUsedInQuote()
-            newMessageViewModel.uiQuoteLiveData.value = null
+            quoteWebView.isVisible = !quoteWebView.isVisible
         }
     }
 
-    private fun removeInlineAttachmentsUsedInQuote() = with(newMessageViewModel) {
-        uiQuoteLiveData.value?.let { html ->
-            attachmentsLiveData.value?.filterOutHtmlCids(html)?.let { attachmentsLiveData.value = it }
-        }
-    }
-
-    private fun List<Attachment>.filterOutHtmlCids(html: String): List<Attachment> {
-        return buildList {
-            addAll(this@filterOutHtmlCids)
-
-            jsoupParseWithLog(html).processCids(
-                attachments = this@filterOutHtmlCids,
-                associateDataToCid = { it },
-                onCidImageFound = { attachment, _ ->
-                    remove(attachment)
-                }
-            )
-        }
-    }
-
-    private fun WebView.loadContent(html: String, webViewGroup: Group) {
+    private fun RichHtmlEditorWebView.loadContent(html: String) {
         val processedHtml = webViewUtils.processHtmlForDisplay(html = html, isDisplayedInDarkMode = context.isNightModeEnabled())
-        loadProcessedContent(processedHtml, webViewGroup)
-    }
-
-    private fun WebView.loadProcessedContent(processedHtml: String, webViewGroup: Group) {
-        webViewGroup.isVisible = processedHtml.isNotBlank()
-        loadDataWithBaseURL("", processedHtml, ClipDescription.MIMETYPE_TEXT_HTML, Utils.UTF_8, "")
+        quoteWebView?.isVisible = false
+        binding.removeQuote.isVisible = processedHtml.isNotBlank()
+        setHtml(processedHtml)
     }
 
     private fun setupFromField(signatures: List<Signature>) = with(binding) {
@@ -609,12 +590,13 @@ class NewMessageFragment : Fragment() {
         trackNewMessageEvent(MatomoName.SwitchIdentity)
 
         binding.editorWebView.exportHtml { html ->
+            val body = Jsoup.parse(html).body()
             val oldSignature = newMessageViewModel.fromLiveData.value?.signature?.content
 
             val bodyHtml = if (!oldSignature.isNullOrEmpty()) {
-                removeSignature(html)
+                removeSignature(body.html())
             } else {
-                html
+                body.html()
             }
 
             newMessageViewModel.fromLiveData.value = UiFrom(signature)
@@ -626,13 +608,21 @@ class NewMessageFragment : Fragment() {
                 if (signature.isDummy) "" else signatureUtils.encapsulateSignatureContentWithInfomaniakClass(newSignatureHtml)
 
             // Combine: New Body + New Signature
-            val finalHtml = bodyHtml + wrappedNewSignature
+            val finalHtml = addSignatureInsideBody(bodyHtml, wrappedNewSignature)
 
             // Update the Editor
             newMessageViewModel.editorBodyInitializer.postValue(BodyContentPayload(finalHtml, BodyContentType.HTML_SANITIZED))
         }
     }
 
+    private fun addSignatureInsideBody(bodyHtml: String, wrappedSignature: String): String {
+        if (wrappedSignature.isEmpty()) return bodyHtml
+
+        val doc = Jsoup.parseBodyFragment(bodyHtml)
+        doc.body().append(wrappedSignature)
+        return doc.body().html()
+    }
+
     private fun removeSignature(html: String): String {
         val doc: Document = Jsoup.parseBodyFragment(html).apply {
             getElementById(MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_ID)?.remove()
@@ -766,15 +756,7 @@ class NewMessageFragment : Fragment() {
     private fun observeBodyLoader() {
         newMessageViewModel.editorBodyInitializer.observe(viewLifecycleOwner) { body ->
             editorContentManager.setContent(binding.editorWebView, body)
-        }
-    }
-
-    private fun observeEditorInitialization() {
-        newMessageViewModel.editorBodyInitializer.observe(viewLifecycleOwner) { bodyPayload ->
-            if (bodyPayload.content.isEmpty()) return@observe
-
-            // This sets the combined Body + Signature
-            editorContentManager.setContent(binding.editorWebView, bodyPayload)
+            editorHasPlaceholder()
         }
     }
 
@@ -783,7 +765,7 @@ class NewMessageFragment : Fragment() {
             if (quote == null) {
                 quoteGroup.isGone = true
             } else {
-                quoteWebView.loadContent(quote, quoteGroup)
+                quoteWebView.loadContent(quote)
             }
         }
     }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index 0c3de8a731f..157ecd6bc8b 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -24,6 +24,7 @@ import android.content.ClipDescription
 import android.content.Intent
 import android.net.Uri
 import android.os.Parcelable
+import android.util.Log
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.net.MailTo
 import androidx.core.net.toUri
@@ -130,6 +131,7 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.invoke
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import splitties.experimental.ExperimentalSplittiesApi
 import java.util.Date
@@ -160,7 +162,8 @@ class NewMessageViewModel @Inject constructor(
     private val ioCoroutineContext = viewModelScope.coroutineContext(ioDispatcher)
 
     //region Initial data
-    private var initialBody: BodyContentPayload = BodyContentPayload.emptyBody()
+    private var initialBody: BodyContentPayload =
+        BodyContentPayload.emptyBody(appContext.getString(R.string.newMessagePlaceholderTitle))
     private var initialSignature: String? = null
     private var initialQuote: String? = null
     //endregion
@@ -549,15 +552,13 @@ class NewMessageViewModel @Inject constructor(
 
         val signatureHtml = draftSignature?.takeIf { !it.isDummy }?.content
         val wrappedSignature = signatureHtml?.let { signatureUtils.encapsulateSignatureContentWithInfomaniakClass(it) }
-
+        val bodyHasSignature = bodyHasSignature(initialBody.content)
         initialBody = BodyContentPayload(
-            content = when {
-                initialBody.content.isNotEmpty() -> initialBody.content
-                wrappedSignature != null -> wrappedSignature
-                else -> ""
-            },
-            type = BodyContentType.HTML_UNSANITIZED
+            content = if (bodyHasSignature || wrappedSignature == null) initialBody.content else initialBody.content + wrappedSignature,
+            type = BodyContentType.HTML_SANITIZED
         )
+
+        Log.d("HTLM initial body", initialBody.content)
         editorBodyInitializer.postValue(initialBody)
 
         uiQuoteLiveData.postValue(initialQuote)
@@ -570,6 +571,10 @@ class NewMessageViewModel @Inject constructor(
         isEncryptionActivated.postValue(isEncrypted)
     }
 
+    fun bodyHasSignature(bodyHtml: String): Boolean {
+        return Jsoup.parseBodyFragment(bodyHtml).getElementById(MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_ID) != null
+    }
+
     private suspend fun getLocalOrRemoteDraft(localUuid: String?): Draft? {
 
         @Suppress("UNUSED_PARAMETER")
@@ -705,7 +710,7 @@ class NewMessageViewModel @Inject constructor(
 
             val bodyContent = mailToIntent?.body?.takeIf(String::isNotEmpty) ?: intent?.getStringExtra(Intent.EXTRA_TEXT)
             val mailToPayload = bodyContent?.let { BodyContentPayload(it, BodyContentType.TEXT_PLAIN_WITH_HTML) }
-            initialBody = mailToPayload ?: BodyContentPayload.emptyBody()
+            initialBody = mailToPayload ?: BodyContentPayload.emptyBody(appContext.getString(R.string.newMessagePlaceholderTitle))
         }
     }
 
diff --git a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
index adca8484f76..3ebb4e9bd38 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
@@ -36,6 +36,7 @@ object MessageBodyUtils {
     const val INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME = "ik_mail_quote"
     const val INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME = "forwardContentMessage"
     const val INFOMANIAK_SIGNATURE_HTML_ID = "ik-signature"
+    const val INFOMANIAK_BODY_HTML_ID = "ik-body"
 
     private const val QUOTE_DETECTION_TIMEOUT = 1_500L
 
diff --git a/app/src/main/res/drawable/ic_more_horiz.xml b/app/src/main/res/drawable/ic_more_horiz.xml
new file mode 100644
index 00000000000..41bca2ea6b8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more_horiz.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Infomaniak Mail - Android
+  ~ Copyright (C) 2026 Infomaniak Network SA
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:tint="@color/iconColor"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"
+        android:fillColor="@color/iconColor" />
+</vector>
diff --git a/app/src/main/res/layout/fragment_new_message.xml b/app/src/main/res/layout/fragment_new_message.xml
index de829f7493d..70854415f28 100644
--- a/app/src/main/res/layout/fragment_new_message.xml
+++ b/app/src/main/res/layout/fragment_new_message.xml
@@ -302,23 +302,6 @@
                         app:layout_constraintTop_toBottomOf="@id/attachmentsRecyclerView"
                         tools:layout_height="100dp" />
 
-                    <TextView
-                        android:id="@+id/newMessagePlaceholder"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginStart="@dimen/marginStandardMedium"
-                        android:paddingBottom="@dimen/marginStandardMedium"
-                        android:text="@string/newMessagePlaceholderTitle"
-                        android:textColor="@color/tertiaryTextColor"
-                        android:visibility="gone"
-                        app:layout_constraintBottom_toBottomOf="@id/editorWebView"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="0"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="@id/editorWebView"
-                        tools:visibility="visible" />
-
                     <LinearLayout
                         android:id="@+id/bodyLoader"
                         android:layout_width="match_parent"
@@ -371,16 +354,16 @@
                         style="@style/IconButtonSmall"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="@dimen/marginStandardSmall"
+                        android:layout_marginStart="@dimen/marginStandardSmall"
                         android:contentDescription="@string/contentDescriptionButtonDeleteQuote"
                         android:minWidth="0dp"
                         android:minHeight="0dp"
-                        app:icon="@drawable/ic_close_small"
+                        app:icon="@drawable/ic_more_horiz"
                         app:layout_constraintDimensionRatio="1"
-                        app:layout_constraintEnd_toEndOf="@id/quoteWebView"
+                        app:layout_constraintStart_toStartOf="@id/editorWebView"
                         app:layout_constraintTop_toBottomOf="@id/editorWebView" />
 
-                    <WebView
+                    <com.infomaniak.lib.richhtmleditor.RichHtmlEditorWebView
                         android:id="@+id/quoteWebView"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -391,14 +374,6 @@
                         app:layout_constraintTop_toBottomOf="@id/removeQuote"
                         tools:visibility="visible" />
 
-                    <androidx.constraintlayout.widget.Group
-                        android:id="@+id/signatureGroup"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:visibility="gone"
-                        app:constraint_referenced_ids="signatureWebView,removeSignature"
-                        tools:visibility="visible" />
-
                     <androidx.constraintlayout.widget.Group
                         android:id="@+id/quoteGroup"
                         android:layout_width="wrap_content"
diff --git a/app/src/main/res/raw/editor_style.css b/app/src/main/res/raw/editor_style.css
index 212270a6280..ff2bbbde4e2 100644
--- a/app/src/main/res/raw/editor_style.css
+++ b/app/src/main/res/raw/editor_style.css
@@ -5,4 +5,15 @@ html {
 body {
     margin-top: 0px;
     margin-bottom: 1rem;
+    font-family: 'Helvetica';
+}
+
+p {
+    min-height: 2em;
+    margin: 0;
+}
+
+.placeholder{
+  color: #b3b3b3;
+
 }

From a802d2ce69d676a0c19dad2b9881d7c3421c7b9e Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Thu, 12 Feb 2026 09:15:49 +0100
Subject: [PATCH 03/94] feat: Add everything into the mainwebview

---
 .../mail/ui/newMessage/BodyContentPayload.kt  |  2 +-
 .../mail/ui/newMessage/NewMessageFragment.kt  | 67 ++-----------------
 .../mail/ui/newMessage/NewMessageViewModel.kt | 13 +++-
 app/src/main/res/drawable/ic_more_horiz.xml   |  4 +-
 .../main/res/layout/fragment_new_message.xml  | 33 ---------
 app/src/main/res/raw/editor_style.css         |  3 +-
 6 files changed, 22 insertions(+), 100 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt
index fef59904f97..98793d17578 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt
@@ -28,7 +28,7 @@ data class BodyContentPayload(val content: String, val type: BodyContentType) {
     companion object {
         fun emptyBody(placeHolderText: String) =
             BodyContentPayload(
-                content = "<div id=$INFOMANIAK_BODY_HTML_ID><p class='placeholder'>$placeHolderText</p></div>",
+                content = "<div id=$INFOMANIAK_BODY_HTML_ID><p class='placeholder'>$placeHolderText</p><br></div>",
                 type = BodyContentType.HTML_SANITIZED
             )
     }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 3937f9cf030..812af17c1d8 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -66,11 +66,9 @@ import com.infomaniak.mail.MatomoMail.trackNewMessageEvent
 import com.infomaniak.mail.MatomoMail.trackScheduleSendEvent
 import com.infomaniak.mail.R
 import com.infomaniak.mail.data.LocalSettings
-import com.infomaniak.mail.data.LocalSettings.ExternalContent
 import com.infomaniak.mail.data.models.Attachment
 import com.infomaniak.mail.data.models.AttachmentDisposition
 import com.infomaniak.mail.data.models.FeatureFlag
-import com.infomaniak.mail.data.models.draft.Draft
 import com.infomaniak.mail.data.models.draft.Draft.DraftAction
 import com.infomaniak.mail.data.models.draft.Draft.DraftMode
 import com.infomaniak.mail.data.models.mailbox.Mailbox
@@ -95,9 +93,7 @@ import com.infomaniak.mail.utils.MessageBodyUtils
 import com.infomaniak.mail.utils.SentryDebug
 import com.infomaniak.mail.utils.SignatureUtils
 import com.infomaniak.mail.utils.UiUtils.PRIMARY_COLOR_CODE
-import com.infomaniak.mail.utils.WebViewUtils
 import com.infomaniak.mail.utils.WebViewUtils.Companion.destroyAndClearHistory
-import com.infomaniak.mail.utils.WebViewUtils.Companion.setupNewMessageWebViewSettings
 import com.infomaniak.mail.utils.extensions.AttachmentExt
 import com.infomaniak.mail.utils.extensions.AttachmentExt.openAttachment
 import com.infomaniak.mail.utils.extensions.applySideAndBottomSystemInsets
@@ -108,7 +104,6 @@ import com.infomaniak.mail.utils.extensions.changeToolbarColorOnScroll
 import com.infomaniak.mail.utils.extensions.enableAlgorithmicDarkening
 import com.infomaniak.mail.utils.extensions.getAttributeColor
 import com.infomaniak.mail.utils.extensions.ime
-import com.infomaniak.mail.utils.extensions.initWebViewClientAndBridge
 import com.infomaniak.mail.utils.extensions.loadCss
 import com.infomaniak.mail.utils.extensions.navigateToDownloadProgressDialog
 import com.infomaniak.mail.utils.extensions.systemBars
@@ -156,7 +151,6 @@ class NewMessageFragment : Fragment() {
     private val attachmentAdapter inline get() = binding.attachmentsRecyclerView.adapter as AttachmentAdapter
 
     private val newMessageActivity by lazy { requireActivity() as NewMessageActivity }
-    private val webViewUtils by lazy { WebViewUtils(requireContext()) }
 
     @Inject
     lateinit var editorContentManager: EditorContentManager
@@ -213,7 +207,6 @@ class NewMessageFragment : Fragment() {
 
         bindAlertToViewLifecycle(descriptionDialog)
 
-        setWebViewReference()
         initMailbox()
         initUi()
         initializeDraft()
@@ -226,7 +219,6 @@ class NewMessageFragment : Fragment() {
         observeAttachments()
         observeImportAttachmentsResult()
         observeBodyLoader()
-        observeUiQuote()
         observeShimmering()
 
         setupBackActionHandler()
@@ -354,14 +346,8 @@ class NewMessageFragment : Fragment() {
         )
     }
 
-    private fun setWebViewReference() {
-        quoteWebView = binding.quoteWebView
-    }
-
     override fun onConfigurationChanged(newConfig: Configuration) {
-        newMessageViewModel.uiQuoteLiveData.value?.let { _ ->
-            binding.quoteWebView.reload()
-        }
+        //TODO: CHECK IF WE SHOULD ADD A RELOD HERE
         super.onConfigurationChanged(newConfig)
     }
 
@@ -405,8 +391,6 @@ class NewMessageFragment : Fragment() {
         toolbar.setNavigationOnClickListener { activity?.onBackPressedDispatcher?.onBackPressed() }
         changeToolbarColorOnScroll(appBarLayout, compositionNestedScrollView)
 
-        quoteWebView.enableAlgorithmicDarkening(true)
-
         attachmentsRecyclerView.adapter = AttachmentAdapter(
             shouldDisplayCloseButton = true,
             onDelete = ::onDeleteAttachment,
@@ -453,6 +437,7 @@ class NewMessageFragment : Fragment() {
 
     private fun initEditorUi() = with(binding) {
         editorWebView.subscribeToStates(setOf(BOLD, ITALIC, UNDERLINE, STRIKE_THROUGH, UNORDERED_LIST, CREATE_LINK))
+        editorWebView.withSpellCheck(false)
         setEditorStyle()
 
         editorAiAnimation.setAnimation(R.raw.euria)
@@ -528,33 +513,6 @@ class NewMessageFragment : Fragment() {
         }
     }
 
-    private fun configureUiWithDraftData(draft: Draft) = with(binding) {
-
-        // Quote
-        quoteWebView.apply {
-            settings.setupNewMessageWebViewSettings()
-            val alwaysShowExternalContent = localSettings.externalContent == ExternalContent.ALWAYS
-            initWebViewClientAndBridge(
-                attachments = draft.attachments,
-                messageUid = "QUOTE-${draft.messageUid}",
-                shouldLoadDistantResources = alwaysShowExternalContent || newMessageViewModel.shouldLoadDistantResources(),
-                navigateToNewMessageActivity = null,
-            )
-        }
-
-        removeQuote.setOnClickListener {
-            trackNewMessageEvent(MatomoName.DeleteQuote)
-            quoteWebView.isVisible = !quoteWebView.isVisible
-        }
-    }
-
-    private fun RichHtmlEditorWebView.loadContent(html: String) {
-        val processedHtml = webViewUtils.processHtmlForDisplay(html = html, isDisplayedInDarkMode = context.isNightModeEnabled())
-        quoteWebView?.isVisible = false
-        binding.removeQuote.isVisible = processedHtml.isNotBlank()
-        setHtml(processedHtml)
-    }
-
     private fun setupFromField(signatures: List<Signature>) = with(binding) {
 
         signatureAdapter.setList(signatures)
@@ -608,18 +566,18 @@ class NewMessageFragment : Fragment() {
                 if (signature.isDummy) "" else signatureUtils.encapsulateSignatureContentWithInfomaniakClass(newSignatureHtml)
 
             // Combine: New Body + New Signature
-            val finalHtml = addSignatureInsideBody(bodyHtml, wrappedNewSignature)
+            val finalHtml = addInsideBody(bodyHtml, wrappedNewSignature)
 
             // Update the Editor
             newMessageViewModel.editorBodyInitializer.postValue(BodyContentPayload(finalHtml, BodyContentType.HTML_SANITIZED))
         }
     }
 
-    private fun addSignatureInsideBody(bodyHtml: String, wrappedSignature: String): String {
-        if (wrappedSignature.isEmpty()) return bodyHtml
+    private fun addInsideBody(bodyHtml: String, element: String): String {
+        if (element.isEmpty()) return bodyHtml
 
         val doc = Jsoup.parseBodyFragment(bodyHtml)
-        doc.body().append(wrappedSignature)
+        doc.body().append(element)
         return doc.body().html()
     }
 
@@ -649,8 +607,7 @@ class NewMessageFragment : Fragment() {
     }
 
     private fun observeInitResult() {
-        newMessageViewModel.initResult.observe(viewLifecycleOwner) { (draft, signatures) ->
-            configureUiWithDraftData(draft)
+        newMessageViewModel.initResult.observe(viewLifecycleOwner) { (_, signatures) ->
             setupFromField(signatures)
             editorManager.setupEditorFormatActions()
             editorManager.setupEditorFormatActionsToggle()
@@ -760,16 +717,6 @@ class NewMessageFragment : Fragment() {
         }
     }
 
-    private fun observeUiQuote() = with(binding) {
-        newMessageViewModel.uiQuoteLiveData.observe(viewLifecycleOwner) { quote ->
-            if (quote == null) {
-                quoteGroup.isGone = true
-            } else {
-                quoteWebView.loadContent(quote)
-            }
-        }
-    }
-
     private fun observeShimmering() = lifecycleScope.launch {
         newMessageViewModel.isShimmering.collect(::setShimmerVisibility)
     }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index 157ecd6bc8b..2bbf2df0154 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -24,7 +24,6 @@ import android.content.ClipDescription
 import android.content.Intent
 import android.net.Uri
 import android.os.Parcelable
-import android.util.Log
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.net.MailTo
 import androidx.core.net.toUri
@@ -553,12 +552,20 @@ class NewMessageViewModel @Inject constructor(
         val signatureHtml = draftSignature?.takeIf { !it.isDummy }?.content
         val wrappedSignature = signatureHtml?.let { signatureUtils.encapsulateSignatureContentWithInfomaniakClass(it) }
         val bodyHasSignature = bodyHasSignature(initialBody.content)
+        var bodyContent = initialBody.content
+
+        if (!bodyHasSignature && wrappedSignature != null) {
+            bodyContent = initialBody.content + wrappedSignature
+        }
+        if (initialQuote != null) {
+            bodyContent += initialQuote
+        }
+
         initialBody = BodyContentPayload(
-            content = if (bodyHasSignature || wrappedSignature == null) initialBody.content else initialBody.content + wrappedSignature,
+            content = bodyContent,
             type = BodyContentType.HTML_SANITIZED
         )
 
-        Log.d("HTLM initial body", initialBody.content)
         editorBodyInitializer.postValue(initialBody)
 
         uiQuoteLiveData.postValue(initialQuote)
diff --git a/app/src/main/res/drawable/ic_more_horiz.xml b/app/src/main/res/drawable/ic_more_horiz.xml
index 41bca2ea6b8..c4d35ea4975 100644
--- a/app/src/main/res/drawable/ic_more_horiz.xml
+++ b/app/src/main/res/drawable/ic_more_horiz.xml
@@ -16,8 +16,8 @@
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:tint="@color/iconColor"
     android:viewportWidth="24"
     android:viewportHeight="24">
diff --git a/app/src/main/res/layout/fragment_new_message.xml b/app/src/main/res/layout/fragment_new_message.xml
index 70854415f28..0540ff656f0 100644
--- a/app/src/main/res/layout/fragment_new_message.xml
+++ b/app/src/main/res/layout/fragment_new_message.xml
@@ -349,39 +349,6 @@
                             android:maxWidth="200dp" />
                     </LinearLayout>
 
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/removeQuote"
-                        style="@style/IconButtonSmall"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/marginStandardSmall"
-                        android:contentDescription="@string/contentDescriptionButtonDeleteQuote"
-                        android:minWidth="0dp"
-                        android:minHeight="0dp"
-                        app:icon="@drawable/ic_more_horiz"
-                        app:layout_constraintDimensionRatio="1"
-                        app:layout_constraintStart_toStartOf="@id/editorWebView"
-                        app:layout_constraintTop_toBottomOf="@id/editorWebView" />
-
-                    <com.infomaniak.lib.richhtmleditor.RichHtmlEditorWebView
-                        android:id="@+id/quoteWebView"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:focusableInTouchMode="false"
-                        android:visibility="gone"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/removeQuote"
-                        tools:visibility="visible" />
-
-                    <androidx.constraintlayout.widget.Group
-                        android:id="@+id/quoteGroup"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:visibility="gone"
-                        app:constraint_referenced_ids="quoteWebView,removeQuote"
-                        tools:visibility="visible" />
-
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/raw/editor_style.css b/app/src/main/res/raw/editor_style.css
index ff2bbbde4e2..65ed7a60936 100644
--- a/app/src/main/res/raw/editor_style.css
+++ b/app/src/main/res/raw/editor_style.css
@@ -9,7 +9,8 @@ body {
 }
 
 p {
-    min-height: 2em;
+    min-height: 1.4em;
+    line-height: 1.4em;
     margin: 0;
 }
 

From 5b0f5e638b3bb8fa7e592b32192c1e59b2a50bbc Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Thu, 12 Feb 2026 16:17:19 +0100
Subject: [PATCH 04/94] feat: Add everything in the same webview and add button
 to hide quotes

---
 .../mail/ui/newMessage/BodyContentPayload.kt  |  2 +-
 .../mail/ui/newMessage/NewMessageFragment.kt  | 13 ++--
 .../mail/ui/newMessage/NewMessageViewModel.kt | 62 +++++++++++++------
 .../infomaniak/mail/utils/MessageBodyUtils.kt |  7 ++-
 app/src/main/res/raw/editor_style.css         |  3 +-
 .../res/raw/toggle_quote_visibility_script.js | 34 ++++++++++
 6 files changed, 93 insertions(+), 28 deletions(-)
 create mode 100644 app/src/main/res/raw/toggle_quote_visibility_script.js

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt
index 98793d17578..fef59904f97 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt
@@ -28,7 +28,7 @@ data class BodyContentPayload(val content: String, val type: BodyContentType) {
     companion object {
         fun emptyBody(placeHolderText: String) =
             BodyContentPayload(
-                content = "<div id=$INFOMANIAK_BODY_HTML_ID><p class='placeholder'>$placeHolderText</p><br></div>",
+                content = "<div id=$INFOMANIAK_BODY_HTML_ID><p class='placeholder'>$placeHolderText</p></div>",
                 type = BodyContentType.HTML_SANITIZED
             )
     }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 812af17c1d8..41246af9a22 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -27,6 +27,7 @@ import android.os.Bundle
 import android.text.InputFilter
 import android.text.Spanned
 import android.transition.TransitionManager
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -53,7 +54,6 @@ import com.infomaniak.core.legacy.utils.SnackbarUtils.showSnackbar
 import com.infomaniak.core.legacy.utils.getBackNavigationResult
 import com.infomaniak.core.legacy.utils.setMargins
 import com.infomaniak.core.ui.showToast
-import com.infomaniak.lib.richhtmleditor.RichHtmlEditorWebView
 import com.infomaniak.lib.richhtmleditor.StatusCommand.BOLD
 import com.infomaniak.lib.richhtmleditor.StatusCommand.CREATE_LINK
 import com.infomaniak.lib.richhtmleditor.StatusCommand.ITALIC
@@ -93,7 +93,6 @@ import com.infomaniak.mail.utils.MessageBodyUtils
 import com.infomaniak.mail.utils.SentryDebug
 import com.infomaniak.mail.utils.SignatureUtils
 import com.infomaniak.mail.utils.UiUtils.PRIMARY_COLOR_CODE
-import com.infomaniak.mail.utils.WebViewUtils.Companion.destroyAndClearHistory
 import com.infomaniak.mail.utils.extensions.AttachmentExt
 import com.infomaniak.mail.utils.extensions.AttachmentExt.openAttachment
 import com.infomaniak.mail.utils.extensions.applySideAndBottomSystemInsets
@@ -106,6 +105,7 @@ import com.infomaniak.mail.utils.extensions.getAttributeColor
 import com.infomaniak.mail.utils.extensions.ime
 import com.infomaniak.mail.utils.extensions.loadCss
 import com.infomaniak.mail.utils.extensions.navigateToDownloadProgressDialog
+import com.infomaniak.mail.utils.extensions.readRawResource
 import com.infomaniak.mail.utils.extensions.systemBars
 import com.infomaniak.mail.utils.extensions.valueOrEmpty
 import com.infomaniak.mail.utils.openKSuiteProBottomSheet
@@ -145,8 +145,6 @@ class NewMessageFragment : Fragment() {
 
     private var addressListPopupWindow: ListPopupWindow? = null
 
-    private var quoteWebView: RichHtmlEditorWebView? = null
-
     private val signatureAdapter = SignatureAdapter(::onSignatureClicked)
     private val attachmentAdapter inline get() = binding.attachmentsRecyclerView.adapter as AttachmentAdapter
 
@@ -358,8 +356,6 @@ class NewMessageFragment : Fragment() {
         }
 
         addressListPopupWindow = null
-        quoteWebView?.destroyAndClearHistory()
-        quoteWebView = null
         TransitionManager.endTransitions(binding.root)
         super.onDestroyView()
         _binding = null
@@ -447,7 +443,7 @@ class NewMessageFragment : Fragment() {
 
     fun editorHasPlaceholder() = with(binding.editorWebView) {
         exportHtml { html ->
-            hasPlaceholder = Jsoup.parseBodyFragment(html).getElementsByClass("placeholder").first() != null
+            hasPlaceholder = newMessageViewModel.bodyHasPlaceholder(html)
         }
     }
 
@@ -548,6 +544,7 @@ class NewMessageFragment : Fragment() {
         trackNewMessageEvent(MatomoName.SwitchIdentity)
 
         binding.editorWebView.exportHtml { html ->
+            Log.d("HTML", html)
             val body = Jsoup.parse(html).body()
             val oldSignature = newMessageViewModel.fromLiveData.value?.signature?.content
 
@@ -713,6 +710,8 @@ class NewMessageFragment : Fragment() {
     private fun observeBodyLoader() {
         newMessageViewModel.editorBodyInitializer.observe(viewLifecycleOwner) { body ->
             editorContentManager.setContent(binding.editorWebView, body)
+            val script = context?.readRawResource(R.raw.toggle_quote_visibility_script)
+            script?.let { binding.editorWebView.addScript(script) }
             editorHasPlaceholder()
         }
     }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index 2bbf2df0154..e850992473b 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -24,6 +24,7 @@ import android.content.ClipDescription
 import android.content.Intent
 import android.net.Uri
 import android.os.Parcelable
+import android.util.Log
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.net.MailTo
 import androidx.core.net.toUri
@@ -173,7 +174,6 @@ class NewMessageViewModel @Inject constructor(
     val ccLiveData = MutableLiveData<UiRecipients>()
     val bccLiveData = MutableLiveData<UiRecipients>()
     val attachmentsLiveData = MutableLiveData<List<Attachment>>()
-    val uiQuoteLiveData = MutableLiveData<String?>()
     inline val allRecipients get() = toLiveData.valueOrEmpty() + ccLiveData.valueOrEmpty() + bccLiveData.valueOrEmpty()
     //endregion
 
@@ -549,26 +549,30 @@ class NewMessageViewModel @Inject constructor(
 
         attachmentsLiveData.postValue(attachments)
 
+        var finalBodyContent = initialBody.content
         val signatureHtml = draftSignature?.takeIf { !it.isDummy }?.content
         val wrappedSignature = signatureHtml?.let { signatureUtils.encapsulateSignatureContentWithInfomaniakClass(it) }
-        val bodyHasSignature = bodyHasSignature(initialBody.content)
-        var bodyContent = initialBody.content
 
-        if (!bodyHasSignature && wrappedSignature != null) {
-            bodyContent = initialBody.content + wrappedSignature
-        }
-        if (initialQuote != null) {
-            bodyContent += initialQuote
+        if (isNewMessage && wrappedSignature != null) {
+            finalBodyContent += wrappedSignature
+        } else if (!initialSignature.isNullOrEmpty()) {
+            finalBodyContent += initialSignature
         }
 
-        initialBody = BodyContentPayload(
-            content = bodyContent,
-            type = BodyContentType.HTML_SANITIZED
-        )
+        if (!initialQuote.isNullOrEmpty()) {
+            finalBodyContent += buildQuoteToggleButton()
+            finalBodyContent += MessageBodyUtils.encapsulateQuotesWithInfomaniakClass(initialQuote.toString())
 
-        editorBodyInitializer.postValue(initialBody)
+        }
 
-        uiQuoteLiveData.postValue(initialQuote)
+        Log.d("BODY", finalBodyContent)
+
+        editorBodyInitializer.postValue(
+            BodyContentPayload(
+                content = finalBodyContent,
+                type = BodyContentType.HTML_SANITIZED
+            )
+        )
 
         if (cc.isNotEmpty() || bcc.isNotEmpty()) {
             otherRecipientsFieldsAreEmpty.postValue(false)
@@ -578,8 +582,31 @@ class NewMessageViewModel @Inject constructor(
         isEncryptionActivated.postValue(isEncrypted)
     }
 
-    fun bodyHasSignature(bodyHtml: String): Boolean {
-        return Jsoup.parseBodyFragment(bodyHtml).getElementById(MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_ID) != null
+    fun bodyHasPlaceholder(bodyHtml: String): Boolean {
+        return Jsoup.parseBodyFragment(bodyHtml).getElementsByClass("placeholder").first() != null
+    }
+
+    private fun buildQuoteToggleButton(): String {
+        return """
+        <button id="quote-toggle-btn" type="button" title="Show quoted text" style="
+    background: none;
+    border: none;
+    cursor: pointer;
+    padding: 8px 12px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    color: #666;
+    font-size: 13px;
+    font-weight: 500;
+">
+    <svg width="20" height="20" viewBox="0 0 24 24" fill="currentColor">
+        <circle cx="5" cy="12" r="2"/>
+        <circle cx="12" cy="12" r="2"/>
+        <circle cx="19" cy="12" r="2"/>
+    </svg>
+</button>
+    """.trimIndent()
     }
 
     private suspend fun getLocalOrRemoteDraft(localUuid: String?): Draft? {
@@ -976,8 +1003,7 @@ class NewMessageViewModel @Inject constructor(
         )
 
         subject = subjectValue
-
-        body = uiBodyValue + (uiQuoteLiveData.value ?: "")
+        body = uiBodyValue
 
         /**
          * If we are opening for the 1st time an existing Draft created somewhere else
diff --git a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
index 3ebb4e9bd38..bf0e97beed7 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
@@ -35,8 +35,9 @@ object MessageBodyUtils {
     const val INFOMANIAK_SIGNATURE_HTML_CLASS_NAME = "editorUserSignature"
     const val INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME = "ik_mail_quote"
     const val INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME = "forwardContentMessage"
-    const val INFOMANIAK_SIGNATURE_HTML_ID = "ik-signature"
     const val INFOMANIAK_BODY_HTML_ID = "ik-body"
+    const val INFOMANIAK_SIGNATURE_HTML_ID = "ik-signature"
+    const val INFOMANIAK_QUOTES_HTML_ID = "ik-quotes"
 
     private const val QUOTE_DETECTION_TIMEOUT = 1_500L
 
@@ -65,6 +66,10 @@ object MessageBodyUtils {
         "[name=\"quote\"]", // GMX
     )
 
+    fun encapsulateQuotesWithInfomaniakClass(quotes: String): String {
+        return """<div id=$INFOMANIAK_QUOTES_HTML_ID>$quotes</div>"""
+    }
+
     suspend fun splitContentAndQuote(body: Body): SplitBody {
 
         val bodyContent = body.value
diff --git a/app/src/main/res/raw/editor_style.css b/app/src/main/res/raw/editor_style.css
index 65ed7a60936..53ddda9d22c 100644
--- a/app/src/main/res/raw/editor_style.css
+++ b/app/src/main/res/raw/editor_style.css
@@ -16,5 +16,6 @@ p {
 
 .placeholder{
   color: #b3b3b3;
-
 }
+
+
diff --git a/app/src/main/res/raw/toggle_quote_visibility_script.js b/app/src/main/res/raw/toggle_quote_visibility_script.js
new file mode 100644
index 00000000000..11acb23a738
--- /dev/null
+++ b/app/src/main/res/raw/toggle_quote_visibility_script.js
@@ -0,0 +1,34 @@
+(function() {
+    function changeQuoteVisibility() {
+        // Hide quotes initially
+        const quoteElements = document.querySelectorAll('[id="ik-quotes"]');
+        quoteElements.forEach(el => {
+            el.style.display = 'none';
+        });
+
+        // Attach click handler to button
+        const button = document.getElementById('quote-toggle-btn');
+
+        if (button) {
+            button.onclick = function(e) {
+                e.preventDefault();
+                const quoteElements = document.querySelectorAll('[id="ik-quotes"]');
+                quoteElements.forEach(el => {
+                    el.style.display = 'block';
+                });
+                button.style.display = 'none';
+            };
+
+//            button.addEventListener('click', function(e) {
+//                e.preventDefault();
+//                const quoteElements = document.querySelectorAll('[id="ik-quotes"]');
+//                quoteElements.forEach(el => {
+//                    el.style.display = 'block';
+//                });
+//                button.style.display = 'none';
+//            });
+        }
+    }
+
+    changeQuoteVisibility();
+})();

From f7a6f361a9597cb56881484fbb4c5b090a2a0322 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Fri, 13 Feb 2026 16:07:12 +0100
Subject: [PATCH 05/94] feat: Changes in quote toggle button and in webview
 focus

---
 .../mail/ui/newMessage/BodyContentPayload.kt  |  2 +-
 .../mail/ui/newMessage/NewMessageFragment.kt  |  9 ++--
 .../mail/ui/newMessage/NewMessageViewModel.kt | 44 ++++++++-----------
 .../infomaniak/mail/utils/MessageBodyUtils.kt | 14 +++++-
 .../infomaniak/mail/utils/SignatureUtils.kt   |  2 +-
 app/src/main/res/raw/style.css                | 23 ++++++++++
 .../res/raw/toggle_quote_visibility_script.js | 36 +++++----------
 7 files changed, 71 insertions(+), 59 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt
index fef59904f97..98793d17578 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt
@@ -28,7 +28,7 @@ data class BodyContentPayload(val content: String, val type: BodyContentType) {
     companion object {
         fun emptyBody(placeHolderText: String) =
             BodyContentPayload(
-                content = "<div id=$INFOMANIAK_BODY_HTML_ID><p class='placeholder'>$placeHolderText</p></div>",
+                content = "<div id=$INFOMANIAK_BODY_HTML_ID><p class='placeholder'>$placeHolderText</p><br></div>",
                 type = BodyContentType.HTML_SANITIZED
             )
     }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 41246af9a22..f4c376d062f 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -433,9 +433,7 @@ class NewMessageFragment : Fragment() {
 
     private fun initEditorUi() = with(binding) {
         editorWebView.subscribeToStates(setOf(BOLD, ITALIC, UNDERLINE, STRIKE_THROUGH, UNORDERED_LIST, CREATE_LINK))
-        editorWebView.withSpellCheck(false)
         setEditorStyle()
-
         editorAiAnimation.setAnimation(R.raw.euria)
         setToolbarEnabledStatus(false)
         handleFocusChanges()
@@ -488,7 +486,8 @@ class NewMessageFragment : Fragment() {
         if (initResult.value == null) {
             initDraftAndViewModel(intent = requireActivity().intent).observe(viewLifecycleOwner) { draft ->
                 if (draft != null) {
-                    showKeyboardInCorrectView(isToFieldEmpty = draft.to.isEmpty())
+                    val isBodyEmpty = newMessageViewModel.bodyHasPlaceholder(draft.body)
+                    showKeyboardInCorrectView(isToFieldEmpty = draft.to.isEmpty(), isBodyEmpty = isBodyEmpty)
                     binding.subjectTextField.setText(draft.subject)
                 } else {
                     requireActivity().apply {
@@ -500,10 +499,10 @@ class NewMessageFragment : Fragment() {
         }
     }
 
-    private fun showKeyboardInCorrectView(isToFieldEmpty: Boolean) = with(recipientFieldsManager) {
+    private fun showKeyboardInCorrectView(isToFieldEmpty: Boolean, isBodyEmpty: Boolean) = with(recipientFieldsManager) {
         when (newMessageViewModel.draftMode()) {
             DraftMode.REPLY,
-            DraftMode.REPLY_ALL -> focusBodyField()
+            DraftMode.REPLY_ALL -> if (isBodyEmpty) focusBodyField()
             DraftMode.FORWARD -> focusToField()
             DraftMode.NEW_MAIL -> if (isToFieldEmpty) focusToField() else focusBodyField()
         }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index e850992473b..77d2692882f 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -87,6 +87,7 @@ import com.infomaniak.mail.utils.DraftInitManager
 import com.infomaniak.mail.utils.JsoupParserUtil.jsoupParseWithLog
 import com.infomaniak.mail.utils.LocalStorageUtils
 import com.infomaniak.mail.utils.MessageBodyUtils
+import com.infomaniak.mail.utils.MessageBodyUtils.INFOMANIAK_QUOTES_HTML_ID
 import com.infomaniak.mail.utils.SentryDebug
 import com.infomaniak.mail.utils.SharedUtils
 import com.infomaniak.mail.utils.SignatureUtils
@@ -559,10 +560,13 @@ class NewMessageViewModel @Inject constructor(
             finalBodyContent += initialSignature
         }
 
+        Log.d("INITIAL QUOTE", initialQuote.toString())
         if (!initialQuote.isNullOrEmpty()) {
-            finalBodyContent += buildQuoteToggleButton()
-            finalBodyContent += MessageBodyUtils.encapsulateQuotesWithInfomaniakClass(initialQuote.toString())
-
+            if (!bodyHasQuotes(initialQuote.toString())) {
+                finalBodyContent += MessageBodyUtils.encapsulateQuotesWithInfomaniakClass(initialQuote.toString())
+            } else {
+                finalBodyContent += initialQuote
+            }
         }
 
         Log.d("BODY", finalBodyContent)
@@ -586,27 +590,9 @@ class NewMessageViewModel @Inject constructor(
         return Jsoup.parseBodyFragment(bodyHtml).getElementsByClass("placeholder").first() != null
     }
 
-    private fun buildQuoteToggleButton(): String {
-        return """
-        <button id="quote-toggle-btn" type="button" title="Show quoted text" style="
-    background: none;
-    border: none;
-    cursor: pointer;
-    padding: 8px 12px;
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    color: #666;
-    font-size: 13px;
-    font-weight: 500;
-">
-    <svg width="20" height="20" viewBox="0 0 24 24" fill="currentColor">
-        <circle cx="5" cy="12" r="2"/>
-        <circle cx="12" cy="12" r="2"/>
-        <circle cx="19" cy="12" r="2"/>
-    </svg>
-</button>
-    """.trimIndent()
+    fun bodyHasQuotes(bodyHtml: String): Boolean {
+        Log.d("SIGNATURE HTML", bodyHtml)
+        return Jsoup.parseBodyFragment(bodyHtml).getElementById(INFOMANIAK_QUOTES_HTML_ID) != null
     }
 
     private suspend fun getLocalOrRemoteDraft(localUuid: String?): Draft? {
@@ -1003,7 +989,7 @@ class NewMessageViewModel @Inject constructor(
         )
 
         subject = subjectValue
-        body = uiBodyValue
+        body = sanitizeBodyBeforeSaving(uiBodyValue)
 
         /**
          * If we are opening for the 1st time an existing Draft created somewhere else
@@ -1024,6 +1010,14 @@ class NewMessageViewModel @Inject constructor(
         }
     }
 
+    private fun sanitizeBodyBeforeSaving(html: String): String {
+        val doc = jsoupParseWithLog(html)
+        // Remove the toggle button before saving
+        doc.getElementById("quote-toggle-btn")?.remove()
+        return doc.html()
+    }
+
+
     private fun Draft.updateDraftAttachmentsWithLiveData(uiAttachments: List<Attachment>, step: String) {
 
         /**
diff --git a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
index bf0e97beed7..6866584fe16 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
@@ -67,7 +67,19 @@ object MessageBodyUtils {
     )
 
     fun encapsulateQuotesWithInfomaniakClass(quotes: String): String {
-        return """<div id=$INFOMANIAK_QUOTES_HTML_ID>$quotes</div>"""
+        return """<div class=$INFOMANIAK_QUOTES_HTML_ID><div id=$INFOMANIAK_QUOTES_HTML_ID style="display: none;" spellcheck=false>$quotes<br></div>${toggleButton()}</div>"""
+    }
+
+    fun toggleButton(): String {
+        return """
+        <button id="quote-toggle-btn" type="button" title="Show quoted text">
+            <svg width="20" height="20" viewBox="0 0 24 24" fill="currentColor">
+                <circle cx="5" cy="12" r="2"/>
+                <circle cx="12" cy="12" r="2"/>
+                <circle cx="19" cy="12" r="2"/>
+            </svg>
+        </button>
+        """.trimIndent()
     }
 
     suspend fun splitContentAndQuote(body: Body): SplitBody {
diff --git a/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt
index 1de9ccee433..99b89f08d85 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt
@@ -33,7 +33,7 @@ class SignatureUtils @Inject constructor(appContext: Context) {
     fun encapsulateSignatureContentWithInfomaniakClass(signatureContent: String): String {
         val verticalMarginsCss = signatureMargins
         val verticalMarginAttributes = extractAttributesFromMarginCss(verticalMarginsCss)
-        return """<div id="$INFOMANIAK_SIGNATURE_HTML_ID" class="$INFOMANIAK_SIGNATURE_HTML_CLASS_NAME" style="$verticalMarginAttributes">$signatureContent</div>"""
+        return """<div id="$INFOMANIAK_SIGNATURE_HTML_ID" class="$INFOMANIAK_SIGNATURE_HTML_CLASS_NAME" spellcheck="false" style="$verticalMarginAttributes">$signatureContent</div>"""
     }
 
     private fun extractAttributesFromMarginCss(verticalMarginsCss: String): String {
diff --git a/app/src/main/res/raw/style.css b/app/src/main/res/raw/style.css
index c7eb27097b6..310584792c3 100644
--- a/app/src/main/res/raw/style.css
+++ b/app/src/main/res/raw/style.css
@@ -11,6 +11,29 @@ body {
     min-width: auto !important;
 }
 
+#ik-quotes, #ik-quotes > * {
+      max-width: 100% !important;
+      box-sizing: border-box !important;
+  }
+
+  #ik-quotes table {
+      width: auto !important;
+      max-width: 100% !important;
+  }
+
+ #quote-toggle-btn {
+     background: none;
+     border: none;
+     cursor: pointer;
+     padding: 8px 12px;
+     display: flex;
+     align-items: center;
+     gap: 8px;
+     color: #666;
+     font-size: 13px;
+     font-weight: 500;
+     }
+
 blockquote {
     padding: 0.2em 1.2em !important;
     margin: 0 !important;
diff --git a/app/src/main/res/raw/toggle_quote_visibility_script.js b/app/src/main/res/raw/toggle_quote_visibility_script.js
index 11acb23a738..03cb75afe41 100644
--- a/app/src/main/res/raw/toggle_quote_visibility_script.js
+++ b/app/src/main/res/raw/toggle_quote_visibility_script.js
@@ -1,33 +1,17 @@
 (function() {
     function changeQuoteVisibility() {
-        // Hide quotes initially
-        const quoteElements = document.querySelectorAll('[id="ik-quotes"]');
-        quoteElements.forEach(el => {
-            el.style.display = 'none';
-        });
-
-        // Attach click handler to button
         const button = document.getElementById('quote-toggle-btn');
+        if (!button) return;
 
-        if (button) {
-            button.onclick = function(e) {
-                e.preventDefault();
-                const quoteElements = document.querySelectorAll('[id="ik-quotes"]');
-                quoteElements.forEach(el => {
-                    el.style.display = 'block';
-                });
-                button.style.display = 'none';
-            };
-
-//            button.addEventListener('click', function(e) {
-//                e.preventDefault();
-//                const quoteElements = document.querySelectorAll('[id="ik-quotes"]');
-//                quoteElements.forEach(el => {
-//                    el.style.display = 'block';
-//                });
-//                button.style.display = 'none';
-//            });
-        }
+        // Attach click handler to button
+        button.onclick = function(e) {
+           e.preventDefault();
+           const quoteElements = document.querySelectorAll('[id="ik-quotes"]');
+           quoteElements.forEach(el => {
+              el.style.display = 'block';
+           });
+           button.style.display = 'none';
+        };
     }
 
     changeQuoteVisibility();

From 73019fa91dd6924b2edf760289d962f8c197e229 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Mon, 16 Feb 2026 08:56:31 +0100
Subject: [PATCH 06/94] refactor: Remove logs, unnused icon and use
 jsoupwithlogs

---
 .../mail/ui/newMessage/NewMessageFragment.kt  | 18 ++++---------
 .../mail/ui/newMessage/NewMessageViewModel.kt | 15 +++++------
 app/src/main/res/drawable/ic_more_horiz.xml   | 27 -------------------
 3 files changed, 11 insertions(+), 49 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_more_horiz.xml

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index f4c376d062f..220f6a19fe8 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -22,12 +22,10 @@ package com.infomaniak.mail.ui.newMessage
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
-import android.content.res.Configuration
 import android.os.Bundle
 import android.text.InputFilter
 import android.text.Spanned
 import android.transition.TransitionManager
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -89,6 +87,7 @@ import com.infomaniak.mail.ui.newMessage.NewMessageViewModel.UiFrom
 import com.infomaniak.mail.ui.newMessage.encryption.EncryptionMessageManager
 import com.infomaniak.mail.ui.newMessage.encryption.EncryptionViewModel
 import com.infomaniak.mail.utils.AccountUtils
+import com.infomaniak.mail.utils.JsoupParserUtil
 import com.infomaniak.mail.utils.MessageBodyUtils
 import com.infomaniak.mail.utils.SentryDebug
 import com.infomaniak.mail.utils.SignatureUtils
@@ -116,7 +115,6 @@ import io.sentry.Sentry
 import io.sentry.SentryLevel
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
-import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import splitties.experimental.ExperimentalSplittiesApi
 import java.util.Date
@@ -344,11 +342,6 @@ class NewMessageFragment : Fragment() {
         )
     }
 
-    override fun onConfigurationChanged(newConfig: Configuration) {
-        //TODO: CHECK IF WE SHOULD ADD A RELOD HERE
-        super.onConfigurationChanged(newConfig)
-    }
-
     override fun onDestroyView() {
         // This block of code is needed in order to keep and reload the content of the editor across configuration changes.
         binding.editorWebView.exportHtml { html ->
@@ -456,7 +449,7 @@ class NewMessageFragment : Fragment() {
 
     private fun removePlaceholder() = with(binding.editorWebView) {
         exportHtml { html ->
-            val doc: Document = Jsoup.parseBodyFragment(html).apply {
+            val doc: Document = JsoupParserUtil.jsoupParseBodyFragmentWithLog(html).apply {
                 getElementsByClass("placeholder").first()?.text("")?.removeClass("placeholder")
             }
 
@@ -543,8 +536,7 @@ class NewMessageFragment : Fragment() {
         trackNewMessageEvent(MatomoName.SwitchIdentity)
 
         binding.editorWebView.exportHtml { html ->
-            Log.d("HTML", html)
-            val body = Jsoup.parse(html).body()
+            val body = JsoupParserUtil.jsoupParseWithLog(html).body()
             val oldSignature = newMessageViewModel.fromLiveData.value?.signature?.content
 
             val bodyHtml = if (!oldSignature.isNullOrEmpty()) {
@@ -572,13 +564,13 @@ class NewMessageFragment : Fragment() {
     private fun addInsideBody(bodyHtml: String, element: String): String {
         if (element.isEmpty()) return bodyHtml
 
-        val doc = Jsoup.parseBodyFragment(bodyHtml)
+        val doc = JsoupParserUtil.jsoupParseBodyFragmentWithLog(bodyHtml)
         doc.body().append(element)
         return doc.body().html()
     }
 
     private fun removeSignature(html: String): String {
-        val doc: Document = Jsoup.parseBodyFragment(html).apply {
+        val doc: Document = JsoupParserUtil.jsoupParseBodyFragmentWithLog(html).apply {
             getElementById(MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_ID)?.remove()
         }
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index 77d2692882f..bcb291d3483 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -84,6 +84,7 @@ import com.infomaniak.mail.ui.newMessage.NewMessageRecipientFieldsManager.FieldT
 import com.infomaniak.mail.utils.AccountUtils
 import com.infomaniak.mail.utils.ContactUtils.arrangeMergedContacts
 import com.infomaniak.mail.utils.DraftInitManager
+import com.infomaniak.mail.utils.JsoupParserUtil
 import com.infomaniak.mail.utils.JsoupParserUtil.jsoupParseWithLog
 import com.infomaniak.mail.utils.LocalStorageUtils
 import com.infomaniak.mail.utils.MessageBodyUtils
@@ -132,7 +133,6 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.invoke
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import splitties.experimental.ExperimentalSplittiesApi
 import java.util.Date
@@ -560,17 +560,14 @@ class NewMessageViewModel @Inject constructor(
             finalBodyContent += initialSignature
         }
 
-        Log.d("INITIAL QUOTE", initialQuote.toString())
         if (!initialQuote.isNullOrEmpty()) {
-            if (!bodyHasQuotes(initialQuote.toString())) {
-                finalBodyContent += MessageBodyUtils.encapsulateQuotesWithInfomaniakClass(initialQuote.toString())
+            finalBodyContent += if (!bodyHasQuotes(initialQuote.toString())) {
+                MessageBodyUtils.encapsulateQuotesWithInfomaniakClass(initialQuote.toString())
             } else {
-                finalBodyContent += initialQuote
+                initialQuote
             }
         }
 
-        Log.d("BODY", finalBodyContent)
-
         editorBodyInitializer.postValue(
             BodyContentPayload(
                 content = finalBodyContent,
@@ -587,12 +584,12 @@ class NewMessageViewModel @Inject constructor(
     }
 
     fun bodyHasPlaceholder(bodyHtml: String): Boolean {
-        return Jsoup.parseBodyFragment(bodyHtml).getElementsByClass("placeholder").first() != null
+        return JsoupParserUtil.jsoupParseBodyFragmentWithLog(bodyHtml).getElementsByClass("placeholder").first() != null
     }
 
     fun bodyHasQuotes(bodyHtml: String): Boolean {
         Log.d("SIGNATURE HTML", bodyHtml)
-        return Jsoup.parseBodyFragment(bodyHtml).getElementById(INFOMANIAK_QUOTES_HTML_ID) != null
+        return JsoupParserUtil.jsoupParseBodyFragmentWithLog(bodyHtml).getElementById(INFOMANIAK_QUOTES_HTML_ID) != null
     }
 
     private suspend fun getLocalOrRemoteDraft(localUuid: String?): Draft? {
diff --git a/app/src/main/res/drawable/ic_more_horiz.xml b/app/src/main/res/drawable/ic_more_horiz.xml
deleted file mode 100644
index c4d35ea4975..00000000000
--- a/app/src/main/res/drawable/ic_more_horiz.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Infomaniak Mail - Android
-  ~ Copyright (C) 2026 Infomaniak Network SA
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="@color/iconColor"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"
-        android:fillColor="@color/iconColor" />
-</vector>

From 6e2580b10f84e732db926b9df669eef8e1d6b278 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Mon, 16 Feb 2026 09:14:47 +0100
Subject: [PATCH 07/94] fix: Add signature before quotes if they exist

---
 .../mail/ui/newMessage/NewMessageFragment.kt          | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 220f6a19fe8..2e45328eab7 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -554,18 +554,23 @@ class NewMessageFragment : Fragment() {
                 if (signature.isDummy) "" else signatureUtils.encapsulateSignatureContentWithInfomaniakClass(newSignatureHtml)
 
             // Combine: New Body + New Signature
-            val finalHtml = addInsideBody(bodyHtml, wrappedNewSignature)
+            val finalHtml = addSignatureInsideBody(bodyHtml, wrappedNewSignature)
 
             // Update the Editor
             newMessageViewModel.editorBodyInitializer.postValue(BodyContentPayload(finalHtml, BodyContentType.HTML_SANITIZED))
         }
     }
 
-    private fun addInsideBody(bodyHtml: String, element: String): String {
+    private fun addSignatureInsideBody(bodyHtml: String, element: String): String {
         if (element.isEmpty()) return bodyHtml
 
         val doc = JsoupParserUtil.jsoupParseBodyFragmentWithLog(bodyHtml)
-        doc.body().append(element)
+        val quotesDiv = doc.body().getElementById(MessageBodyUtils.INFOMANIAK_QUOTES_HTML_ID)
+        if (quotesDiv != null) {
+            quotesDiv.before(element)
+        } else {
+            doc.body().append(element)
+        }
         return doc.body().html()
     }
 

From 75c23ac6e1d99fe3b3106e49f87e0ccc9b9734de Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Mon, 16 Feb 2026 13:41:26 +0100
Subject: [PATCH 08/94] feat: Show images on forward

---
 .../ReplyForwardFooterManager.kt              | 18 +++++++---
 .../mail/ui/newMessage/NewMessageFragment.kt  | 36 +++----------------
 .../mail/ui/newMessage/NewMessageViewModel.kt | 18 ++++++++++
 .../mail/utils/extensions/AttachmentExt.kt    | 35 ++++++++++++++++++
 4 files changed, 70 insertions(+), 37 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ReplyForwardFooterManager.kt b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ReplyForwardFooterManager.kt
index 95807dc5c79..6463cdb65d9 100644
--- a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ReplyForwardFooterManager.kt
+++ b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ReplyForwardFooterManager.kt
@@ -31,6 +31,7 @@ import com.infomaniak.mail.utils.MessageBodyUtils
 import com.infomaniak.mail.utils.SharedUtils
 import com.infomaniak.mail.utils.Utils
 import com.infomaniak.mail.utils.date.MailDateFormatUtils.formatForHeader
+import com.infomaniak.mail.utils.extensions.AttachmentExt.getScaledLocalBase64
 import com.infomaniak.mail.utils.extensions.toDate
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
@@ -46,14 +47,21 @@ class ReplyForwardFooterManager @Inject constructor(private val appContext: Cont
             document.processCids(
                 attachments = message.attachments,
                 associateDataToCid = { oldAttachment ->
-                    val newAttachment = attachmentsToForward.find { it.originalContentId == oldAttachment.contentId }
-                    newAttachment?.contentId
+                    attachmentsToForward.find {
+                        it.originalContentId == oldAttachment.contentId || it.name == oldAttachment.name
+                    }
                 },
-                onCidImageFound = { newContentId, imageElement ->
-                    imageElement.attr(SRC_ATTRIBUTE, "${CID_PROTOCOL}$newContentId")
+                onCidImageFound = { attachment, imageElement ->
+                    // get the image in base64, since the richHtmlEditorWebView doesn't work correctly with Cids.
+                    val base64 = attachment.getScaledLocalBase64(appContext)
+                    if (base64 != null) {
+                        imageElement.attr(SRC_ATTRIBUTE, "data:${attachment.mimeType};base64,$base64")
+                        imageElement.attr("style", "max-width: 100%; height: auto;")
+                    } else {
+                        imageElement.attr(SRC_ATTRIBUTE, "${CID_PROTOCOL}${attachment.contentId}")
+                    }
                 },
             )
-
             document.outerHtml()
         } ?: ""
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 2e45328eab7..e87d044f61e 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -88,7 +88,6 @@ import com.infomaniak.mail.ui.newMessage.encryption.EncryptionMessageManager
 import com.infomaniak.mail.ui.newMessage.encryption.EncryptionViewModel
 import com.infomaniak.mail.utils.AccountUtils
 import com.infomaniak.mail.utils.JsoupParserUtil
-import com.infomaniak.mail.utils.MessageBodyUtils
 import com.infomaniak.mail.utils.SentryDebug
 import com.infomaniak.mail.utils.SignatureUtils
 import com.infomaniak.mail.utils.UiUtils.PRIMARY_COLOR_CODE
@@ -433,9 +432,7 @@ class NewMessageFragment : Fragment() {
     }
 
     fun editorHasPlaceholder() = with(binding.editorWebView) {
-        exportHtml { html ->
-            hasPlaceholder = newMessageViewModel.bodyHasPlaceholder(html)
-        }
+        exportHtml { html -> hasPlaceholder = newMessageViewModel.bodyHasPlaceholder(html) }
     }
 
     private fun setEditorStyle() = with(binding.editorWebView) {
@@ -452,12 +449,8 @@ class NewMessageFragment : Fragment() {
             val doc: Document = JsoupParserUtil.jsoupParseBodyFragmentWithLog(html).apply {
                 getElementsByClass("placeholder").first()?.text("")?.removeClass("placeholder")
             }
-
             newMessageViewModel.editorBodyInitializer.postValue(
-                BodyContentPayload(
-                    doc.html(),
-                    BodyContentType.HTML_SANITIZED
-                )
+                BodyContentPayload(doc.html(), BodyContentType.HTML_SANITIZED)
             )
         }
     }
@@ -540,7 +533,7 @@ class NewMessageFragment : Fragment() {
             val oldSignature = newMessageViewModel.fromLiveData.value?.signature?.content
 
             val bodyHtml = if (!oldSignature.isNullOrEmpty()) {
-                removeSignature(body.html())
+                newMessageViewModel.removeSignature(body.html())
             } else {
                 body.html()
             }
@@ -554,34 +547,13 @@ class NewMessageFragment : Fragment() {
                 if (signature.isDummy) "" else signatureUtils.encapsulateSignatureContentWithInfomaniakClass(newSignatureHtml)
 
             // Combine: New Body + New Signature
-            val finalHtml = addSignatureInsideBody(bodyHtml, wrappedNewSignature)
+            val finalHtml = newMessageViewModel.addSignatureInsideBody(bodyHtml, wrappedNewSignature)
 
             // Update the Editor
             newMessageViewModel.editorBodyInitializer.postValue(BodyContentPayload(finalHtml, BodyContentType.HTML_SANITIZED))
         }
     }
 
-    private fun addSignatureInsideBody(bodyHtml: String, element: String): String {
-        if (element.isEmpty()) return bodyHtml
-
-        val doc = JsoupParserUtil.jsoupParseBodyFragmentWithLog(bodyHtml)
-        val quotesDiv = doc.body().getElementById(MessageBodyUtils.INFOMANIAK_QUOTES_HTML_ID)
-        if (quotesDiv != null) {
-            quotesDiv.before(element)
-        } else {
-            doc.body().append(element)
-        }
-        return doc.body().html()
-    }
-
-    private fun removeSignature(html: String): String {
-        val doc: Document = JsoupParserUtil.jsoupParseBodyFragmentWithLog(html).apply {
-            getElementById(MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_ID)?.remove()
-        }
-
-        return doc.html()
-    }
-
     private fun updateSelectedSignatureInFromField(signature: Signature) {
 
         val defaultFormat = if (signature.senderName.isBlank()) {
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index bcb291d3483..bd9c397055e 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -476,6 +476,24 @@ class NewMessageViewModel @Inject constructor(
         return BodyData(BodyContentPayload(body, BodyContentType.HTML_UNSANITIZED), signature, quote)
     }
 
+    fun addSignatureInsideBody(bodyHtml: String, element: String): String {
+        if (element.isEmpty()) return bodyHtml
+
+        return JsoupParserUtil.jsoupParseBodyFragmentWithLog(bodyHtml).apply {
+            // if the mail has quotes, add the signature before the quotes.
+            val body = body()
+            body.getElementById(INFOMANIAK_QUOTES_HTML_ID)?.before(element) ?: body.append(element)
+        }.body().html()
+    }
+
+    fun removeSignature(html: String): String {
+        val doc: Document = JsoupParserUtil.jsoupParseBodyFragmentWithLog(html).apply {
+            getElementById(MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_ID)?.remove()
+        }
+
+        return doc.html()
+    }
+
     private suspend fun populateWithExternalMailDataIfNeeded(draft: Draft, intent: Intent) {
         when (intent.action) {
             Intent.ACTION_SEND -> handleSingleSendIntent(draft, intent)
diff --git a/app/src/main/java/com/infomaniak/mail/utils/extensions/AttachmentExt.kt b/app/src/main/java/com/infomaniak/mail/utils/extensions/AttachmentExt.kt
index ae1198d532f..8b9f4ca3bb6 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/extensions/AttachmentExt.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/extensions/AttachmentExt.kt
@@ -20,8 +20,11 @@ package com.infomaniak.mail.utils.extensions
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
 import android.os.Bundle
 import android.provider.MediaStore.Files.FileColumns
+import android.util.Base64
 import androidx.core.content.FileProvider
 import com.infomaniak.core.common.extensions.goToAppStore
 import com.infomaniak.core.legacy.utils.hasSupportedApplications
@@ -45,6 +48,8 @@ import com.infomaniak.mail.utils.extensions.AttachmentExt.AttachmentIntentType.S
 import io.realm.kotlin.Realm
 import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.withContext
+import java.io.ByteArrayOutputStream
+import kotlin.math.roundToInt
 import com.infomaniak.core.legacy.R as RCore
 
 object AttachmentExt {
@@ -113,6 +118,36 @@ object AttachmentExt {
         }
     }
 
+    fun Attachment.getScaledLocalBase64(context: Context, maxWidth: Int = 1024): String? {
+        val file = getUploadLocalFile() ?: getCacheFile(context)
+        if (!file.exists()) return null
+
+        return try {
+            val options = BitmapFactory.Options().apply { inJustDecodeBounds = true }
+            BitmapFactory.decodeFile(file.absolutePath, options)
+
+            var inSampleSize = 1
+            if (options.outWidth > maxWidth) {
+                inSampleSize = (options.outWidth.toFloat() / maxWidth.toFloat()).roundToInt()
+            }
+
+            val rescaledOptions = BitmapFactory.Options().apply {
+                this.inSampleSize = inSampleSize
+            }
+
+            val bitmap = BitmapFactory.decodeFile(file.absolutePath, rescaledOptions) ?: return null
+
+            val outputStream = ByteArrayOutputStream()
+            // Compress as JPEG to 8 0% quality to reduce size
+            bitmap.compress(Bitmap.CompressFormat.JPEG, 80, outputStream)
+            val byteArray = outputStream.toByteArray()
+
+            Base64.encodeToString(byteArray, Base64.NO_WRAP)
+        } catch (e: Exception) {
+            null
+        }
+    }
+
     fun Attachment.createDownloadDialogNavArgs(intentType: AttachmentIntentType): Bundle {
         return DownloadAttachmentProgressDialogArgs(
             attachmentLocalUuid = localUuid,

From 7385a7902f6f1f2dc1f22b63774545efe8426d6a Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Mon, 16 Feb 2026 14:16:38 +0100
Subject: [PATCH 09/94] fix: Use images cids and remove loadWithOverviewMode on
 new message

---
 .../ReplyForwardFooterManager.kt              | 17 ++++-------------
 .../mail/ui/newMessage/NewMessageFragment.kt  | 19 ++++++++++++++++++-
 .../com/infomaniak/mail/utils/WebViewUtils.kt |  4 +---
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ReplyForwardFooterManager.kt b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ReplyForwardFooterManager.kt
index 6463cdb65d9..9f29f544cf9 100644
--- a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ReplyForwardFooterManager.kt
+++ b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ReplyForwardFooterManager.kt
@@ -31,7 +31,6 @@ import com.infomaniak.mail.utils.MessageBodyUtils
 import com.infomaniak.mail.utils.SharedUtils
 import com.infomaniak.mail.utils.Utils
 import com.infomaniak.mail.utils.date.MailDateFormatUtils.formatForHeader
-import com.infomaniak.mail.utils.extensions.AttachmentExt.getScaledLocalBase64
 import com.infomaniak.mail.utils.extensions.toDate
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
@@ -47,19 +46,11 @@ class ReplyForwardFooterManager @Inject constructor(private val appContext: Cont
             document.processCids(
                 attachments = message.attachments,
                 associateDataToCid = { oldAttachment ->
-                    attachmentsToForward.find {
-                        it.originalContentId == oldAttachment.contentId || it.name == oldAttachment.name
-                    }
+                    val newAttachment = attachmentsToForward.find { it.originalContentId == oldAttachment.contentId }
+                    newAttachment?.contentId
                 },
-                onCidImageFound = { attachment, imageElement ->
-                    // get the image in base64, since the richHtmlEditorWebView doesn't work correctly with Cids.
-                    val base64 = attachment.getScaledLocalBase64(appContext)
-                    if (base64 != null) {
-                        imageElement.attr(SRC_ATTRIBUTE, "data:${attachment.mimeType};base64,$base64")
-                        imageElement.attr("style", "max-width: 100%; height: auto;")
-                    } else {
-                        imageElement.attr(SRC_ATTRIBUTE, "${CID_PROTOCOL}${attachment.contentId}")
-                    }
+                onCidImageFound = { newContentId, imageElement ->
+                    imageElement.attr(SRC_ATTRIBUTE, "${CID_PROTOCOL}$newContentId")
                 },
             )
             document.outerHtml()
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index e87d044f61e..508e73482f5 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -67,6 +67,7 @@ import com.infomaniak.mail.data.LocalSettings
 import com.infomaniak.mail.data.models.Attachment
 import com.infomaniak.mail.data.models.AttachmentDisposition
 import com.infomaniak.mail.data.models.FeatureFlag
+import com.infomaniak.mail.data.models.draft.Draft
 import com.infomaniak.mail.data.models.draft.Draft.DraftAction
 import com.infomaniak.mail.data.models.draft.Draft.DraftMode
 import com.infomaniak.mail.data.models.mailbox.Mailbox
@@ -91,6 +92,7 @@ import com.infomaniak.mail.utils.JsoupParserUtil
 import com.infomaniak.mail.utils.SentryDebug
 import com.infomaniak.mail.utils.SignatureUtils
 import com.infomaniak.mail.utils.UiUtils.PRIMARY_COLOR_CODE
+import com.infomaniak.mail.utils.WebViewUtils.Companion.setupNewMessageWebViewSettings
 import com.infomaniak.mail.utils.extensions.AttachmentExt
 import com.infomaniak.mail.utils.extensions.AttachmentExt.openAttachment
 import com.infomaniak.mail.utils.extensions.applySideAndBottomSystemInsets
@@ -101,6 +103,7 @@ import com.infomaniak.mail.utils.extensions.changeToolbarColorOnScroll
 import com.infomaniak.mail.utils.extensions.enableAlgorithmicDarkening
 import com.infomaniak.mail.utils.extensions.getAttributeColor
 import com.infomaniak.mail.utils.extensions.ime
+import com.infomaniak.mail.utils.extensions.initWebViewClientAndBridge
 import com.infomaniak.mail.utils.extensions.loadCss
 import com.infomaniak.mail.utils.extensions.navigateToDownloadProgressDialog
 import com.infomaniak.mail.utils.extensions.readRawResource
@@ -494,6 +497,19 @@ class NewMessageFragment : Fragment() {
         }
     }
 
+    private fun configureUiWithDraftData(draft: Draft) = with(binding) {
+        editorWebView.apply {
+            settings.setupNewMessageWebViewSettings()
+            val alwaysShowExternalContent = localSettings.externalContent == LocalSettings.ExternalContent.ALWAYS
+            initWebViewClientAndBridge(
+                attachments = draft.attachments,
+                messageUid = "QUOTE-${draft.messageUid}",
+                shouldLoadDistantResources = alwaysShowExternalContent || newMessageViewModel.shouldLoadDistantResources(),
+                navigateToNewMessageActivity = null,
+            )
+        }
+    }
+
     private fun setupFromField(signatures: List<Signature>) = with(binding) {
 
         signatureAdapter.setList(signatures)
@@ -572,7 +588,8 @@ class NewMessageFragment : Fragment() {
     }
 
     private fun observeInitResult() {
-        newMessageViewModel.initResult.observe(viewLifecycleOwner) { (_, signatures) ->
+        newMessageViewModel.initResult.observe(viewLifecycleOwner) { (draft, signatures) ->
+            configureUiWithDraftData(draft)
             setupFromField(signatures)
             editorManager.setupEditorFormatActions()
             editorManager.setupEditorFormatActionsToggle()
diff --git a/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
index de1cb26180e..0b2c620c814 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
@@ -138,15 +138,13 @@ class WebViewUtils(context: Context) {
             @SuppressLint("SetJavaScriptEnabled")
             javaScriptEnabled = true
 
-            loadWithOverviewMode = true
-            useWideViewPort = true
-
             cacheMode = LOAD_CACHE_ELSE_NETWORK
         }
 
         fun WebSettings.setupThreadWebViewSettings() {
             setupCommonWebViewSettings()
 
+            loadWithOverviewMode = true
             setSupportZoom(true)
             builtInZoomControls = true
             displayZoomControls = false

From 4d59bb03f2a486b1b09caed0aaa7317016c348f3 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Mon, 16 Feb 2026 14:29:34 +0100
Subject: [PATCH 10/94] refactor: Remove unnecesary log

---
 .../com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index bd9c397055e..16259a7e832 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -24,7 +24,6 @@ import android.content.ClipDescription
 import android.content.Intent
 import android.net.Uri
 import android.os.Parcelable
-import android.util.Log
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.net.MailTo
 import androidx.core.net.toUri
@@ -606,7 +605,6 @@ class NewMessageViewModel @Inject constructor(
     }
 
     fun bodyHasQuotes(bodyHtml: String): Boolean {
-        Log.d("SIGNATURE HTML", bodyHtml)
         return JsoupParserUtil.jsoupParseBodyFragmentWithLog(bodyHtml).getElementById(INFOMANIAK_QUOTES_HTML_ID) != null
     }
 

From d5957bf75a86782929c39cfa6af1e1fc009a44c0 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Mon, 16 Feb 2026 14:33:19 +0100
Subject: [PATCH 11/94] refactor: Remove unused function

---
 .../mail/utils/extensions/AttachmentExt.kt    | 35 -------------------
 1 file changed, 35 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/utils/extensions/AttachmentExt.kt b/app/src/main/java/com/infomaniak/mail/utils/extensions/AttachmentExt.kt
index 8b9f4ca3bb6..ae1198d532f 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/extensions/AttachmentExt.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/extensions/AttachmentExt.kt
@@ -20,11 +20,8 @@ package com.infomaniak.mail.utils.extensions
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
 import android.os.Bundle
 import android.provider.MediaStore.Files.FileColumns
-import android.util.Base64
 import androidx.core.content.FileProvider
 import com.infomaniak.core.common.extensions.goToAppStore
 import com.infomaniak.core.legacy.utils.hasSupportedApplications
@@ -48,8 +45,6 @@ import com.infomaniak.mail.utils.extensions.AttachmentExt.AttachmentIntentType.S
 import io.realm.kotlin.Realm
 import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.withContext
-import java.io.ByteArrayOutputStream
-import kotlin.math.roundToInt
 import com.infomaniak.core.legacy.R as RCore
 
 object AttachmentExt {
@@ -118,36 +113,6 @@ object AttachmentExt {
         }
     }
 
-    fun Attachment.getScaledLocalBase64(context: Context, maxWidth: Int = 1024): String? {
-        val file = getUploadLocalFile() ?: getCacheFile(context)
-        if (!file.exists()) return null
-
-        return try {
-            val options = BitmapFactory.Options().apply { inJustDecodeBounds = true }
-            BitmapFactory.decodeFile(file.absolutePath, options)
-
-            var inSampleSize = 1
-            if (options.outWidth > maxWidth) {
-                inSampleSize = (options.outWidth.toFloat() / maxWidth.toFloat()).roundToInt()
-            }
-
-            val rescaledOptions = BitmapFactory.Options().apply {
-                this.inSampleSize = inSampleSize
-            }
-
-            val bitmap = BitmapFactory.decodeFile(file.absolutePath, rescaledOptions) ?: return null
-
-            val outputStream = ByteArrayOutputStream()
-            // Compress as JPEG to 8 0% quality to reduce size
-            bitmap.compress(Bitmap.CompressFormat.JPEG, 80, outputStream)
-            val byteArray = outputStream.toByteArray()
-
-            Base64.encodeToString(byteArray, Base64.NO_WRAP)
-        } catch (e: Exception) {
-            null
-        }
-    }
-
     fun Attachment.createDownloadDialogNavArgs(intentType: AttachmentIntentType): Bundle {
         return DownloadAttachmentProgressDialogArgs(
             attachmentLocalUuid = localUuid,

From 7143acd588239cd700f265301eaa437969e92b1a Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Mon, 16 Feb 2026 14:34:19 +0100
Subject: [PATCH 12/94] refactor: Fix identation in style css

---
 app/src/main/res/raw/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/raw/style.css b/app/src/main/res/raw/style.css
index 310584792c3..b1c3c4539e4 100644
--- a/app/src/main/res/raw/style.css
+++ b/app/src/main/res/raw/style.css
@@ -32,7 +32,7 @@ body {
      color: #666;
      font-size: 13px;
      font-weight: 500;
-     }
+ }
 
 blockquote {
     padding: 0.2em 1.2em !important;

From 1b1bb1e0e929f6a96332d8665cdefd824056cdef Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Mon, 16 Feb 2026 15:03:45 +0100
Subject: [PATCH 13/94] refactor: Fix sonar issues

---
 .../java/com/infomaniak/mail/utils/MessageBodyUtils.kt     | 7 ++++++-
 .../main/java/com/infomaniak/mail/utils/SignatureUtils.kt  | 6 +++++-
 app/src/main/res/raw/editor_style.css                      | 1 -
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
index 6866584fe16..fef33137ebc 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
@@ -67,7 +67,12 @@ object MessageBodyUtils {
     )
 
     fun encapsulateQuotesWithInfomaniakClass(quotes: String): String {
-        return """<div class=$INFOMANIAK_QUOTES_HTML_ID><div id=$INFOMANIAK_QUOTES_HTML_ID style="display: none;" spellcheck=false>$quotes<br></div>${toggleButton()}</div>"""
+        return """
+        <div class=$INFOMANIAK_QUOTES_HTML_ID>
+           <div id=$INFOMANIAK_QUOTES_HTML_ID style="display: none;" spellcheck=false>$quotes<br></div>
+           ${toggleButton()}
+        </div>
+        """.trimMargin()
     }
 
     fun toggleButton(): String {
diff --git a/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt
index 99b89f08d85..5029f978b17 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt
@@ -33,7 +33,11 @@ class SignatureUtils @Inject constructor(appContext: Context) {
     fun encapsulateSignatureContentWithInfomaniakClass(signatureContent: String): String {
         val verticalMarginsCss = signatureMargins
         val verticalMarginAttributes = extractAttributesFromMarginCss(verticalMarginsCss)
-        return """<div id="$INFOMANIAK_SIGNATURE_HTML_ID" class="$INFOMANIAK_SIGNATURE_HTML_CLASS_NAME" spellcheck="false" style="$verticalMarginAttributes">$signatureContent</div>"""
+        return """
+            <div id="$INFOMANIAK_SIGNATURE_HTML_ID" class="$INFOMANIAK_SIGNATURE_HTML_CLASS_NAME" spellcheck="false" style="$verticalMarginAttributes">
+            $signatureContent
+            </div>
+        """.trimIndent()
     }
 
     private fun extractAttributesFromMarginCss(verticalMarginsCss: String): String {
diff --git a/app/src/main/res/raw/editor_style.css b/app/src/main/res/raw/editor_style.css
index 53ddda9d22c..ffda7a77f13 100644
--- a/app/src/main/res/raw/editor_style.css
+++ b/app/src/main/res/raw/editor_style.css
@@ -5,7 +5,6 @@ html {
 body {
     margin-top: 0px;
     margin-bottom: 1rem;
-    font-family: 'Helvetica';
 }
 
 p {

From cbe18628aa9994f53626bc50731391f877478980 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Wed, 25 Feb 2026 13:16:25 +0100
Subject: [PATCH 14/94] feat: Add textview placeholder and change signature
 with js

---
 .../mail/ui/newMessage/BodyContentPayload.kt  |  8 +-
 .../mail/ui/newMessage/NewMessageFragment.kt  | 93 ++++++++-----------
 .../mail/ui/newMessage/NewMessageViewModel.kt | 32 ++-----
 .../infomaniak/mail/utils/MessageBodyUtils.kt |  8 +-
 .../infomaniak/mail/utils/SignatureUtils.kt   |  3 +-
 .../main/res/layout/fragment_new_message.xml  | 17 ++++
 app/src/main/res/raw/editor_style.css         |  4 -
 .../res/raw/toggle_quote_visibility_script.js | 12 ++-
 8 files changed, 84 insertions(+), 93 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt
index 98793d17578..f445b35b1e1 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt
@@ -17,8 +17,6 @@
  */
 package com.infomaniak.mail.ui.newMessage
 
-import com.infomaniak.mail.utils.MessageBodyUtils.INFOMANIAK_BODY_HTML_ID
-
 /**
  * @param content The string representation of the body in either html or plain text format.
  * @param type The type of representation of [content]. Each type will lead to different processing of the content.
@@ -26,10 +24,10 @@ import com.infomaniak.mail.utils.MessageBodyUtils.INFOMANIAK_BODY_HTML_ID
 data class BodyContentPayload(val content: String, val type: BodyContentType) {
 
     companion object {
-        fun emptyBody(placeHolderText: String) =
+        fun emptyBody() =
             BodyContentPayload(
-                content = "<div id=$INFOMANIAK_BODY_HTML_ID><p class='placeholder'>$placeHolderText</p><br></div>",
-                type = BodyContentType.HTML_SANITIZED
+                content = "<br id=lineBreakAtBeginningOfSignature>",
+                type = BodyContentType.TEXT_PLAIN_WITHOUT_HTML
             )
     }
 }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 508e73482f5..8826313944e 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -67,7 +67,6 @@ import com.infomaniak.mail.data.LocalSettings
 import com.infomaniak.mail.data.models.Attachment
 import com.infomaniak.mail.data.models.AttachmentDisposition
 import com.infomaniak.mail.data.models.FeatureFlag
-import com.infomaniak.mail.data.models.draft.Draft
 import com.infomaniak.mail.data.models.draft.Draft.DraftAction
 import com.infomaniak.mail.data.models.draft.Draft.DraftMode
 import com.infomaniak.mail.data.models.mailbox.Mailbox
@@ -88,7 +87,7 @@ import com.infomaniak.mail.ui.newMessage.NewMessageViewModel.UiFrom
 import com.infomaniak.mail.ui.newMessage.encryption.EncryptionMessageManager
 import com.infomaniak.mail.ui.newMessage.encryption.EncryptionViewModel
 import com.infomaniak.mail.utils.AccountUtils
-import com.infomaniak.mail.utils.JsoupParserUtil
+import com.infomaniak.mail.utils.MessageBodyUtils
 import com.infomaniak.mail.utils.SentryDebug
 import com.infomaniak.mail.utils.SignatureUtils
 import com.infomaniak.mail.utils.UiUtils.PRIMARY_COLOR_CODE
@@ -103,7 +102,6 @@ import com.infomaniak.mail.utils.extensions.changeToolbarColorOnScroll
 import com.infomaniak.mail.utils.extensions.enableAlgorithmicDarkening
 import com.infomaniak.mail.utils.extensions.getAttributeColor
 import com.infomaniak.mail.utils.extensions.ime
-import com.infomaniak.mail.utils.extensions.initWebViewClientAndBridge
 import com.infomaniak.mail.utils.extensions.loadCss
 import com.infomaniak.mail.utils.extensions.navigateToDownloadProgressDialog
 import com.infomaniak.mail.utils.extensions.readRawResource
@@ -117,7 +115,6 @@ import io.sentry.Sentry
 import io.sentry.SentryLevel
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
-import org.jsoup.nodes.Document
 import splitties.experimental.ExperimentalSplittiesApi
 import java.util.Date
 import javax.inject.Inject
@@ -434,10 +431,6 @@ class NewMessageFragment : Fragment() {
         handleFocusChanges()
     }
 
-    fun editorHasPlaceholder() = with(binding.editorWebView) {
-        exportHtml { html -> hasPlaceholder = newMessageViewModel.bodyHasPlaceholder(html) }
-    }
-
     private fun setEditorStyle() = with(binding.editorWebView) {
         enableAlgorithmicDarkening(isEnabled = true)
         if (context.isNightModeEnabled()) addCss(context.loadCss(R.raw.custom_dark_mode))
@@ -447,15 +440,9 @@ class NewMessageFragment : Fragment() {
         addCss(context.loadCss(R.raw.editor_style, customColors))
     }
 
-    private fun removePlaceholder() = with(binding.editorWebView) {
-        exportHtml { html ->
-            val doc: Document = JsoupParserUtil.jsoupParseBodyFragmentWithLog(html).apply {
-                getElementsByClass("placeholder").first()?.text("")?.removeClass("placeholder")
-            }
-            newMessageViewModel.editorBodyInitializer.postValue(
-                BodyContentPayload(doc.html(), BodyContentType.HTML_SANITIZED)
-            )
-        }
+    private fun removePlaceholder() {
+        binding.newMessagePlaceholder.visibility = View.GONE
+        hasPlaceholder = false
     }
 
     private fun handleFocusChanges() {
@@ -476,6 +463,7 @@ class NewMessageFragment : Fragment() {
             initDraftAndViewModel(intent = requireActivity().intent).observe(viewLifecycleOwner) { draft ->
                 if (draft != null) {
                     val isBodyEmpty = newMessageViewModel.bodyHasPlaceholder(draft.body)
+                    binding.newMessagePlaceholder.isVisible = isBodyEmpty
                     showKeyboardInCorrectView(isToFieldEmpty = draft.to.isEmpty(), isBodyEmpty = isBodyEmpty)
                     binding.subjectTextField.setText(draft.subject)
                 } else {
@@ -497,18 +485,7 @@ class NewMessageFragment : Fragment() {
         }
     }
 
-    private fun configureUiWithDraftData(draft: Draft) = with(binding) {
-        editorWebView.apply {
-            settings.setupNewMessageWebViewSettings()
-            val alwaysShowExternalContent = localSettings.externalContent == LocalSettings.ExternalContent.ALWAYS
-            initWebViewClientAndBridge(
-                attachments = draft.attachments,
-                messageUid = "QUOTE-${draft.messageUid}",
-                shouldLoadDistantResources = alwaysShowExternalContent || newMessageViewModel.shouldLoadDistantResources(),
-                navigateToNewMessageActivity = null,
-            )
-        }
-    }
+    private fun configureUiWithDraftData() = binding.editorWebView.settings.setupNewMessageWebViewSettings()
 
     private fun setupFromField(signatures: List<Signature>) = with(binding) {
 
@@ -544,29 +521,42 @@ class NewMessageFragment : Fragment() {
     private fun onSignatureClicked(signature: Signature) {
         trackNewMessageEvent(MatomoName.SwitchIdentity)
 
-        binding.editorWebView.exportHtml { html ->
-            val body = JsoupParserUtil.jsoupParseWithLog(html).body()
-            val oldSignature = newMessageViewModel.fromLiveData.value?.signature?.content
-
-            val bodyHtml = if (!oldSignature.isNullOrEmpty()) {
-                newMessageViewModel.removeSignature(body.html())
-            } else {
-                body.html()
+        // Get the New Signature HTML
+        val newSignatureHtml = signature.content
+        val wrappedNewSignature =
+            if (signature.isDummy) "" else signatureUtils.encapsulateSignatureContentWithInfomaniakClass(newSignatureHtml)
+
+        val escapedSignature = wrappedNewSignature
+            .replace("\\", "\\\\")
+            .replace("\"", "\\\"")
+            .replace("\n", "\\n")
+            .replace("\r", "\\r")
+
+        val replaceSignatureScript = """
+        (function() {
+            var sigElement = document.querySelector('.${MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_CLASS_NAME}');
+            var newSigHtml = "$escapedSignature";
+            if (sigElement) {
+                if (newSigHtml === "") {
+                    sigElement.remove();
+                } else {
+                    sigElement.outerHTML = newSigHtml;
+                }
+            } else if (newSigHtml !== "") {
+                var quotes = document.querySelector('.${MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME}');
+                if (quotes) {
+                    quotes.insertAdjacentHTML('beforebegin', newSigHtml);
+                } else {
+                    document.body.insertAdjacentHTML('beforeend', newSigHtml);
+                }
             }
+        })()
+    """.trimIndent()
 
-            newMessageViewModel.fromLiveData.value = UiFrom(signature)
+        binding.editorWebView.evaluateJavascript(replaceSignatureScript) {
+            newMessageViewModel.fromLiveData.value =
+                UiFrom(signature)
             addressListPopupWindow?.dismiss()
-
-            // Get the New Signature HTML
-            val newSignatureHtml = signature.content
-            val wrappedNewSignature =
-                if (signature.isDummy) "" else signatureUtils.encapsulateSignatureContentWithInfomaniakClass(newSignatureHtml)
-
-            // Combine: New Body + New Signature
-            val finalHtml = newMessageViewModel.addSignatureInsideBody(bodyHtml, wrappedNewSignature)
-
-            // Update the Editor
-            newMessageViewModel.editorBodyInitializer.postValue(BodyContentPayload(finalHtml, BodyContentType.HTML_SANITIZED))
         }
     }
 
@@ -588,8 +578,8 @@ class NewMessageFragment : Fragment() {
     }
 
     private fun observeInitResult() {
-        newMessageViewModel.initResult.observe(viewLifecycleOwner) { (draft, signatures) ->
-            configureUiWithDraftData(draft)
+        newMessageViewModel.initResult.observe(viewLifecycleOwner) { (_, signatures) ->
+            configureUiWithDraftData()
             setupFromField(signatures)
             editorManager.setupEditorFormatActions()
             editorManager.setupEditorFormatActionsToggle()
@@ -697,7 +687,6 @@ class NewMessageFragment : Fragment() {
             editorContentManager.setContent(binding.editorWebView, body)
             val script = context?.readRawResource(R.raw.toggle_quote_visibility_script)
             script?.let { binding.editorWebView.addScript(script) }
-            editorHasPlaceholder()
         }
     }
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index 16259a7e832..45800b1b327 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -24,6 +24,7 @@ import android.content.ClipDescription
 import android.content.Intent
 import android.net.Uri
 import android.os.Parcelable
+import android.util.Log
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.net.MailTo
 import androidx.core.net.toUri
@@ -87,7 +88,6 @@ import com.infomaniak.mail.utils.JsoupParserUtil
 import com.infomaniak.mail.utils.JsoupParserUtil.jsoupParseWithLog
 import com.infomaniak.mail.utils.LocalStorageUtils
 import com.infomaniak.mail.utils.MessageBodyUtils
-import com.infomaniak.mail.utils.MessageBodyUtils.INFOMANIAK_QUOTES_HTML_ID
 import com.infomaniak.mail.utils.SentryDebug
 import com.infomaniak.mail.utils.SharedUtils
 import com.infomaniak.mail.utils.SignatureUtils
@@ -162,8 +162,7 @@ class NewMessageViewModel @Inject constructor(
     private val ioCoroutineContext = viewModelScope.coroutineContext(ioDispatcher)
 
     //region Initial data
-    private var initialBody: BodyContentPayload =
-        BodyContentPayload.emptyBody(appContext.getString(R.string.newMessagePlaceholderTitle))
+    private var initialBody: BodyContentPayload = BodyContentPayload.emptyBody()
     private var initialSignature: String? = null
     private var initialQuote: String? = null
     //endregion
@@ -427,6 +426,7 @@ class NewMessageViewModel @Inject constructor(
 
     private fun splitSignatureAndQuoteFromBody(draft: Draft) {
         val remoteBody = draft.body
+        Log.d("DRAFT BODY", remoteBody)
         if (remoteBody.isEmpty()) return
 
         val (body, signature, quote) = when (draft.mimeType) {
@@ -475,24 +475,6 @@ class NewMessageViewModel @Inject constructor(
         return BodyData(BodyContentPayload(body, BodyContentType.HTML_UNSANITIZED), signature, quote)
     }
 
-    fun addSignatureInsideBody(bodyHtml: String, element: String): String {
-        if (element.isEmpty()) return bodyHtml
-
-        return JsoupParserUtil.jsoupParseBodyFragmentWithLog(bodyHtml).apply {
-            // if the mail has quotes, add the signature before the quotes.
-            val body = body()
-            body.getElementById(INFOMANIAK_QUOTES_HTML_ID)?.before(element) ?: body.append(element)
-        }.body().html()
-    }
-
-    fun removeSignature(html: String): String {
-        val doc: Document = JsoupParserUtil.jsoupParseBodyFragmentWithLog(html).apply {
-            getElementById(MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_ID)?.remove()
-        }
-
-        return doc.html()
-    }
-
     private suspend fun populateWithExternalMailDataIfNeeded(draft: Draft, intent: Intent) {
         when (intent.action) {
             Intent.ACTION_SEND -> handleSingleSendIntent(draft, intent)
@@ -601,11 +583,13 @@ class NewMessageViewModel @Inject constructor(
     }
 
     fun bodyHasPlaceholder(bodyHtml: String): Boolean {
-        return JsoupParserUtil.jsoupParseBodyFragmentWithLog(bodyHtml).getElementsByClass("placeholder").first() != null
+        val body = JsoupParserUtil.jsoupParseBodyFragmentWithLog(bodyHtml).body()
+        return body.text() == ""
     }
 
     fun bodyHasQuotes(bodyHtml: String): Boolean {
-        return JsoupParserUtil.jsoupParseBodyFragmentWithLog(bodyHtml).getElementById(INFOMANIAK_QUOTES_HTML_ID) != null
+        return JsoupParserUtil.jsoupParseBodyFragmentWithLog(bodyHtml)
+            .getElementsByClass(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME) != null
     }
 
     private suspend fun getLocalOrRemoteDraft(localUuid: String?): Draft? {
@@ -743,7 +727,7 @@ class NewMessageViewModel @Inject constructor(
 
             val bodyContent = mailToIntent?.body?.takeIf(String::isNotEmpty) ?: intent?.getStringExtra(Intent.EXTRA_TEXT)
             val mailToPayload = bodyContent?.let { BodyContentPayload(it, BodyContentType.TEXT_PLAIN_WITH_HTML) }
-            initialBody = mailToPayload ?: BodyContentPayload.emptyBody(appContext.getString(R.string.newMessagePlaceholderTitle))
+            initialBody = mailToPayload ?: BodyContentPayload.emptyBody()
         }
     }
 
diff --git a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
index fef33137ebc..9cc14e3b59d 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
@@ -35,8 +35,6 @@ object MessageBodyUtils {
     const val INFOMANIAK_SIGNATURE_HTML_CLASS_NAME = "editorUserSignature"
     const val INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME = "ik_mail_quote"
     const val INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME = "forwardContentMessage"
-    const val INFOMANIAK_BODY_HTML_ID = "ik-body"
-    const val INFOMANIAK_SIGNATURE_HTML_ID = "ik-signature"
     const val INFOMANIAK_QUOTES_HTML_ID = "ik-quotes"
 
     private const val QUOTE_DETECTION_TIMEOUT = 1_500L
@@ -68,11 +66,11 @@ object MessageBodyUtils {
 
     fun encapsulateQuotesWithInfomaniakClass(quotes: String): String {
         return """
-        <div class=$INFOMANIAK_QUOTES_HTML_ID>
-           <div id=$INFOMANIAK_QUOTES_HTML_ID style="display: none;" spellcheck=false>$quotes<br></div>
+        <div>
+           <div class=$INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME spellcheck=false>$quotes<br></div>
            ${toggleButton()}
         </div>
-        """.trimMargin()
+        """.trimIndent()
     }
 
     fun toggleButton(): String {
diff --git a/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt
index 5029f978b17..65f8f0a4821 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt
@@ -20,7 +20,6 @@ package com.infomaniak.mail.utils
 import android.content.Context
 import com.infomaniak.mail.R
 import com.infomaniak.mail.utils.MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_CLASS_NAME
-import com.infomaniak.mail.utils.MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_ID
 import com.infomaniak.mail.utils.extensions.loadCss
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -34,7 +33,7 @@ class SignatureUtils @Inject constructor(appContext: Context) {
         val verticalMarginsCss = signatureMargins
         val verticalMarginAttributes = extractAttributesFromMarginCss(verticalMarginsCss)
         return """
-            <div id="$INFOMANIAK_SIGNATURE_HTML_ID" class="$INFOMANIAK_SIGNATURE_HTML_CLASS_NAME" spellcheck="false" style="$verticalMarginAttributes">
+            <div class="$INFOMANIAK_SIGNATURE_HTML_CLASS_NAME" spellcheck="false" style="$verticalMarginAttributes">
             $signatureContent
             </div>
         """.trimIndent()
diff --git a/app/src/main/res/layout/fragment_new_message.xml b/app/src/main/res/layout/fragment_new_message.xml
index 0540ff656f0..ed47932abcf 100644
--- a/app/src/main/res/layout/fragment_new_message.xml
+++ b/app/src/main/res/layout/fragment_new_message.xml
@@ -302,6 +302,23 @@
                         app:layout_constraintTop_toBottomOf="@id/attachmentsRecyclerView"
                         tools:layout_height="100dp" />
 
+                    <TextView
+                        android:id="@+id/newMessagePlaceholder"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="@dimen/marginStandardMedium"
+                        android:paddingBottom="@dimen/marginStandardMedium"
+                        android:text="@string/newMessagePlaceholderTitle"
+                        android:textColor="@color/tertiaryTextColor"
+                        android:visibility="gone"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintHorizontal_bias="0"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="@id/editorWebView"
+                        tools:visibility="visible" />
+
+
                     <LinearLayout
                         android:id="@+id/bodyLoader"
                         android:layout_width="match_parent"
diff --git a/app/src/main/res/raw/editor_style.css b/app/src/main/res/raw/editor_style.css
index ffda7a77f13..1e263ed9804 100644
--- a/app/src/main/res/raw/editor_style.css
+++ b/app/src/main/res/raw/editor_style.css
@@ -13,8 +13,4 @@ p {
     margin: 0;
 }
 
-.placeholder{
-  color: #b3b3b3;
-}
-
 
diff --git a/app/src/main/res/raw/toggle_quote_visibility_script.js b/app/src/main/res/raw/toggle_quote_visibility_script.js
index 03cb75afe41..e6e1e30b1c5 100644
--- a/app/src/main/res/raw/toggle_quote_visibility_script.js
+++ b/app/src/main/res/raw/toggle_quote_visibility_script.js
@@ -1,12 +1,22 @@
 (function() {
     function changeQuoteVisibility() {
         const button = document.getElementById('quote-toggle-btn');
+        console.log("BUTTON", button)
         if (!button) return;
 
+        // Hide quotes initially and show toggle button
+        const quoteElements = document.querySelectorAll('.ik_mail_quote');
+        console.log("QUOTES ELEMENTS", quotesElements)
+        if (quoteElements.style != 'block') {
+            quoteElements.forEach(el => {
+                el.style.display = 'none';
+            });
+            button.style.display = 'block';
+        }
+
         // Attach click handler to button
         button.onclick = function(e) {
            e.preventDefault();
-           const quoteElements = document.querySelectorAll('[id="ik-quotes"]');
            quoteElements.forEach(el => {
               el.style.display = 'block';
            });

From 306f48950a39e892023b61bdf7ea4c3e02c4249d Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Wed, 25 Feb 2026 15:27:28 +0100
Subject: [PATCH 15/94] feat: Remove splitting of mail body if it's a draft and
 fix save snapshot logic

---
 .../mail/ui/newMessage/NewMessageViewModel.kt | 47 ++++++++++++-------
 .../infomaniak/mail/utils/MessageBodyUtils.kt |  8 +---
 .../res/raw/toggle_quote_visibility_script.js |  2 +-
 3 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index 45800b1b327..0116bbfcd29 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -88,6 +88,7 @@ import com.infomaniak.mail.utils.JsoupParserUtil
 import com.infomaniak.mail.utils.JsoupParserUtil.jsoupParseWithLog
 import com.infomaniak.mail.utils.LocalStorageUtils
 import com.infomaniak.mail.utils.MessageBodyUtils
+import com.infomaniak.mail.utils.MessageBodyUtils.toggleButton
 import com.infomaniak.mail.utils.SentryDebug
 import com.infomaniak.mail.utils.SharedUtils
 import com.infomaniak.mail.utils.SignatureUtils
@@ -328,10 +329,8 @@ class NewMessageViewModel @Inject constructor(
             markAsRead(currentMailbox(), realm)
 
             realm.write { DraftController.upsertDraftBlocking(it, realm = this) }
-            it.saveSnapshot(initialBody.content)
             it.initLiveData(signatures)
             _isShimmering.emit(false)
-
             initResult.postValue(InitResult(it, signatures))
         }
 
@@ -344,7 +343,10 @@ class NewMessageViewModel @Inject constructor(
             if (draft.identityId.isNullOrBlank()) {
                 draft.identityId = currentMailbox().getDefaultSignatureWithFallback().id.toString()
             }
-            splitSignatureAndQuoteFromBody(draft)
+            val contentType =
+                if (draft.mimeType == Utils.TEXT_PLAIN) BodyContentType.TEXT_PLAIN_WITH_HTML else BodyContentType.HTML_SANITIZED
+            initialBody = BodyContentPayload(draft.body, contentType)
+            return draft
         }
     }
 
@@ -555,21 +557,22 @@ class NewMessageViewModel @Inject constructor(
 
         if (isNewMessage && wrappedSignature != null) {
             finalBodyContent += wrappedSignature
-        } else if (!initialSignature.isNullOrEmpty()) {
-            finalBodyContent += initialSignature
         }
 
-        if (!initialQuote.isNullOrEmpty()) {
-            finalBodyContent += if (!bodyHasQuotes(initialQuote.toString())) {
-                MessageBodyUtils.encapsulateQuotesWithInfomaniakClass(initialQuote.toString())
-            } else {
-                initialQuote
-            }
+        if (isNewMessage && !initialQuote.isNullOrEmpty()) {
+            finalBodyContent += MessageBodyUtils.encapsulateQuotesWithInfomaniakClass(initialQuote.toString())
+        }
+
+        if (bodyHasQuotes(finalBodyContent)) {
+            finalBodyContent += toggleButton()
         }
 
+        val normalizedBody = normalizeHtml(finalBodyContent)
+        saveSnapshot(normalizedBody)
+
         editorBodyInitializer.postValue(
             BodyContentPayload(
-                content = finalBodyContent,
+                content = normalizedBody,
                 type = BodyContentType.HTML_SANITIZED
             )
         )
@@ -589,7 +592,13 @@ class NewMessageViewModel @Inject constructor(
 
     fun bodyHasQuotes(bodyHtml: String): Boolean {
         return JsoupParserUtil.jsoupParseBodyFragmentWithLog(bodyHtml)
-            .getElementsByClass(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME) != null
+            .getElementsByClass(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME).count() > 0
+    }
+
+    private fun normalizeHtml(html: String): String {
+        val doc = jsoupParseWithLog(html)
+        doc.outputSettings().prettyPrint(false)
+        return doc.body().html()
     }
 
     private suspend fun getLocalOrRemoteDraft(localUuid: String?): Draft? {
@@ -986,7 +995,7 @@ class NewMessageViewModel @Inject constructor(
         )
 
         subject = subjectValue
-        body = sanitizeBodyBeforeSaving(uiBodyValue)
+        body = uiBodyValue
 
         /**
          * If we are opening for the 1st time an existing Draft created somewhere else
@@ -1002,19 +1011,19 @@ class NewMessageViewModel @Inject constructor(
 
         // Only if `!isFinishing`, because if we are finishing, well… We're out of here so we don't care about all of that.
         if (!isFinishing) {
-            copyFromRealm().saveSnapshot(uiBodyValue)
+            val normalizedBody = normalizeHtml(uiBodyValue)
+            copyFromRealm().saveSnapshot(normalizedBody)
             isNewMessage = false
         }
     }
 
-    private fun sanitizeBodyBeforeSaving(html: String): String {
+    private fun sanitizeBody(html: String): String {
         val doc = jsoupParseWithLog(html)
         // Remove the toggle button before saving
         doc.getElementById("quote-toggle-btn")?.remove()
         return doc.html()
     }
 
-
     private fun Draft.updateDraftAttachmentsWithLiveData(uiAttachments: List<Attachment>, step: String) {
 
         /**
@@ -1054,13 +1063,15 @@ class NewMessageViewModel @Inject constructor(
     }
 
     private fun isSnapshotTheSame(subjectValue: String?, uiBodyValue: String): Boolean {
+        Log.d("BODY VALUE", uiBodyValue)
+        Log.d("SNAPSHOT", snapshot?.uiBody.toString())
         return snapshot?.let { draftSnapshot ->
             draftSnapshot.identityId == fromLiveData.value?.signature?.id?.toString() &&
                     draftSnapshot.to == toLiveData.valueOrEmpty().toSet() &&
                     draftSnapshot.cc == ccLiveData.valueOrEmpty().toSet() &&
                     draftSnapshot.bcc == bccLiveData.valueOrEmpty().toSet() &&
                     draftSnapshot.subject == subjectValue &&
-                    draftSnapshot.uiBody == uiBodyValue &&
+                    sanitizeBody(draftSnapshot.uiBody) == sanitizeBody(uiBodyValue) &&
                     draftSnapshot.isEncrypted == isEncryptionActivated.value &&
                     draftSnapshot.encryptionPassword == encryptionPassword.value &&
                     draftSnapshot.attachmentsLocalUuids == attachmentsLiveData.valueOrEmpty()
diff --git a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
index 9cc14e3b59d..6f43b96b2a7 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
@@ -35,7 +35,6 @@ object MessageBodyUtils {
     const val INFOMANIAK_SIGNATURE_HTML_CLASS_NAME = "editorUserSignature"
     const val INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME = "ik_mail_quote"
     const val INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME = "forwardContentMessage"
-    const val INFOMANIAK_QUOTES_HTML_ID = "ik-quotes"
 
     private const val QUOTE_DETECTION_TIMEOUT = 1_500L
 
@@ -65,12 +64,7 @@ object MessageBodyUtils {
     )
 
     fun encapsulateQuotesWithInfomaniakClass(quotes: String): String {
-        return """
-        <div>
-           <div class=$INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME spellcheck=false>$quotes<br></div>
-           ${toggleButton()}
-        </div>
-        """.trimIndent()
+        return """<div class=$INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME spellcheck=false>$quotes<br></div>""".trimIndent()
     }
 
     fun toggleButton(): String {
diff --git a/app/src/main/res/raw/toggle_quote_visibility_script.js b/app/src/main/res/raw/toggle_quote_visibility_script.js
index e6e1e30b1c5..5727a9745ec 100644
--- a/app/src/main/res/raw/toggle_quote_visibility_script.js
+++ b/app/src/main/res/raw/toggle_quote_visibility_script.js
@@ -6,7 +6,7 @@
 
         // Hide quotes initially and show toggle button
         const quoteElements = document.querySelectorAll('.ik_mail_quote');
-        console.log("QUOTES ELEMENTS", quotesElements)
+
         if (quoteElements.style != 'block') {
             quoteElements.forEach(el => {
                 el.style.display = 'none';

From 86f88c9e27915258ffade4be42faaeb39443dd97 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Thu, 26 Feb 2026 15:38:25 +0100
Subject: [PATCH 16/94] fix: Fix cid images and webclient for attachments

---
 .../mail/ui/newMessage/NewMessageFragment.kt  | 42 +++++++++++------
 .../mail/ui/newMessage/NewMessageViewModel.kt | 24 +++++++---
 .../infomaniak/mail/utils/HtmlFormatter.kt    | 10 ++++
 .../com/infomaniak/mail/utils/WebViewUtils.kt | 11 -----
 app/src/main/res/drawable/ic_more_horiz.xml   | 28 +++++++++++
 .../main/res/layout/fragment_new_message.xml  | 10 ++++
 app/src/main/res/raw/signature_margins.css    |  2 +-
 app/src/main/res/raw/style.css                | 46 ++++++++++---------
 .../res/raw/toggle_quote_visibility_script.js | 14 ++++--
 9 files changed, 129 insertions(+), 58 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_more_horiz.xml

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 8826313944e..9881ccf01ff 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -67,6 +67,7 @@ import com.infomaniak.mail.data.LocalSettings
 import com.infomaniak.mail.data.models.Attachment
 import com.infomaniak.mail.data.models.AttachmentDisposition
 import com.infomaniak.mail.data.models.FeatureFlag
+import com.infomaniak.mail.data.models.draft.Draft
 import com.infomaniak.mail.data.models.draft.Draft.DraftAction
 import com.infomaniak.mail.data.models.draft.Draft.DraftMode
 import com.infomaniak.mail.data.models.mailbox.Mailbox
@@ -87,10 +88,15 @@ import com.infomaniak.mail.ui.newMessage.NewMessageViewModel.UiFrom
 import com.infomaniak.mail.ui.newMessage.encryption.EncryptionMessageManager
 import com.infomaniak.mail.ui.newMessage.encryption.EncryptionViewModel
 import com.infomaniak.mail.utils.AccountUtils
+import com.infomaniak.mail.utils.HtmlFormatter.Companion.getCustomDarkMode
+import com.infomaniak.mail.utils.HtmlFormatter.Companion.getCustomEditorStyle
+import com.infomaniak.mail.utils.HtmlFormatter.Companion.getCustomStyle
+import com.infomaniak.mail.utils.HtmlFormatter.Companion.getSignatureMarginStyle
+import com.infomaniak.mail.utils.HtmlFormatter.Companion.getToggleQuotesButtonVisibilityScript
 import com.infomaniak.mail.utils.MessageBodyUtils
 import com.infomaniak.mail.utils.SentryDebug
 import com.infomaniak.mail.utils.SignatureUtils
-import com.infomaniak.mail.utils.UiUtils.PRIMARY_COLOR_CODE
+import com.infomaniak.mail.utils.WebViewUtils
 import com.infomaniak.mail.utils.WebViewUtils.Companion.setupNewMessageWebViewSettings
 import com.infomaniak.mail.utils.extensions.AttachmentExt
 import com.infomaniak.mail.utils.extensions.AttachmentExt.openAttachment
@@ -100,11 +106,9 @@ import com.infomaniak.mail.utils.extensions.applyWindowInsetsListener
 import com.infomaniak.mail.utils.extensions.bindAlertToViewLifecycle
 import com.infomaniak.mail.utils.extensions.changeToolbarColorOnScroll
 import com.infomaniak.mail.utils.extensions.enableAlgorithmicDarkening
-import com.infomaniak.mail.utils.extensions.getAttributeColor
 import com.infomaniak.mail.utils.extensions.ime
-import com.infomaniak.mail.utils.extensions.loadCss
+import com.infomaniak.mail.utils.extensions.initWebViewClientAndBridge
 import com.infomaniak.mail.utils.extensions.navigateToDownloadProgressDialog
-import com.infomaniak.mail.utils.extensions.readRawResource
 import com.infomaniak.mail.utils.extensions.systemBars
 import com.infomaniak.mail.utils.extensions.valueOrEmpty
 import com.infomaniak.mail.utils.openKSuiteProBottomSheet
@@ -118,7 +122,6 @@ import kotlinx.coroutines.launch
 import splitties.experimental.ExperimentalSplittiesApi
 import java.util.Date
 import javax.inject.Inject
-import androidx.appcompat.R as RAndroid
 
 @AndroidEntryPoint
 class NewMessageFragment : Fragment() {
@@ -146,6 +149,7 @@ class NewMessageFragment : Fragment() {
     private val attachmentAdapter inline get() = binding.attachmentsRecyclerView.adapter as AttachmentAdapter
 
     private val newMessageActivity by lazy { requireActivity() as NewMessageActivity }
+    private val webViewUtils by lazy { WebViewUtils(requireContext()) }
 
     @Inject
     lateinit var editorContentManager: EditorContentManager
@@ -183,6 +187,7 @@ class NewMessageFragment : Fragment() {
     @Inject
     lateinit var dateAndTimeScheduleDialog: SelectDateAndTimeForScheduledDraftDialog
 
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         return FragmentNewMessageBinding.inflate(inflater, container, false).also { _binding = it }.root
     }
@@ -433,11 +438,10 @@ class NewMessageFragment : Fragment() {
 
     private fun setEditorStyle() = with(binding.editorWebView) {
         enableAlgorithmicDarkening(isEnabled = true)
-        if (context.isNightModeEnabled()) addCss(context.loadCss(R.raw.custom_dark_mode))
-
-        val customColors = listOf(PRIMARY_COLOR_CODE to context.getAttributeColor(RAndroid.attr.colorPrimary))
-        addCss(context.loadCss(R.raw.style, customColors))
-        addCss(context.loadCss(R.raw.editor_style, customColors))
+        if (context.isNightModeEnabled()) addCss(context.getCustomDarkMode())
+        addCss(context.getCustomStyle())
+        addCss(context.getCustomEditorStyle())
+        addCss(context.getSignatureMarginStyle())
     }
 
     private fun removePlaceholder() {
@@ -485,7 +489,16 @@ class NewMessageFragment : Fragment() {
         }
     }
 
-    private fun configureUiWithDraftData() = binding.editorWebView.settings.setupNewMessageWebViewSettings()
+    private fun configureUiWithDraftData(draft: Draft) = with(binding.editorWebView) {
+        settings.setupNewMessageWebViewSettings()
+        webViewClient =
+            initWebViewClientAndBridge(
+                attachments = draft.attachments,
+                messageUid = "MESSAGE-" + draft.messageUid,
+                shouldLoadDistantResources = true,
+                navigateToNewMessageActivity = null
+            )
+    }
 
     private fun setupFromField(signatures: List<Signature>) = with(binding) {
 
@@ -578,8 +591,8 @@ class NewMessageFragment : Fragment() {
     }
 
     private fun observeInitResult() {
-        newMessageViewModel.initResult.observe(viewLifecycleOwner) { (_, signatures) ->
-            configureUiWithDraftData()
+        newMessageViewModel.initResult.observe(viewLifecycleOwner) { (draft, signatures) ->
+            configureUiWithDraftData(draft)
             setupFromField(signatures)
             editorManager.setupEditorFormatActions()
             editorManager.setupEditorFormatActionsToggle()
@@ -685,8 +698,7 @@ class NewMessageFragment : Fragment() {
     private fun observeBodyLoader() {
         newMessageViewModel.editorBodyInitializer.observe(viewLifecycleOwner) { body ->
             editorContentManager.setContent(binding.editorWebView, body)
-            val script = context?.readRawResource(R.raw.toggle_quote_visibility_script)
-            script?.let { binding.editorWebView.addScript(script) }
+            binding.editorWebView.addScript(requireContext().getToggleQuotesButtonVisibilityScript())
         }
     }
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index 0116bbfcd29..7cd7116a16a 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -563,13 +563,13 @@ class NewMessageViewModel @Inject constructor(
             finalBodyContent += MessageBodyUtils.encapsulateQuotesWithInfomaniakClass(initialQuote.toString())
         }
 
+        var normalizedBody = normalizeHtml(finalBodyContent)
+        saveSnapshot(normalizedBody)
+
         if (bodyHasQuotes(finalBodyContent)) {
-            finalBodyContent += toggleButton()
+            normalizedBody += toggleButton()
         }
 
-        val normalizedBody = normalizeHtml(finalBodyContent)
-        saveSnapshot(normalizedBody)
-
         editorBodyInitializer.postValue(
             BodyContentPayload(
                 content = normalizedBody,
@@ -591,8 +591,11 @@ class NewMessageViewModel @Inject constructor(
     }
 
     fun bodyHasQuotes(bodyHtml: String): Boolean {
-        return JsoupParserUtil.jsoupParseBodyFragmentWithLog(bodyHtml)
+        val bodyHasQuotes = JsoupParserUtil.jsoupParseBodyFragmentWithLog(bodyHtml)
             .getElementsByClass(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME).count() > 0
+        val toggleButtonAlreadyExists = JsoupParserUtil.jsoupParseBodyFragmentWithLog(bodyHtml)
+            .getElementById("quote-toggle-btn") != null
+        return bodyHasQuotes && !toggleButtonAlreadyExists
     }
 
     private fun normalizeHtml(html: String): String {
@@ -995,7 +998,7 @@ class NewMessageViewModel @Inject constructor(
         )
 
         subject = subjectValue
-        body = uiBodyValue
+        body = sanitizeBody(uiBodyValue)
 
         /**
          * If we are opening for the 1st time an existing Draft created somewhere else
@@ -1011,7 +1014,7 @@ class NewMessageViewModel @Inject constructor(
 
         // Only if `!isFinishing`, because if we are finishing, well… We're out of here so we don't care about all of that.
         if (!isFinishing) {
-            val normalizedBody = normalizeHtml(uiBodyValue)
+            val normalizedBody = normalizeHtml(body)
             copyFromRealm().saveSnapshot(normalizedBody)
             isNewMessage = false
         }
@@ -1019,6 +1022,13 @@ class NewMessageViewModel @Inject constructor(
 
     private fun sanitizeBody(html: String): String {
         val doc = jsoupParseWithLog(html)
+        // If the user deleted the quotes text, remove the quotes div.
+        val bodyHasEmptyQuotes = JsoupParserUtil.jsoupParseBodyFragmentWithLog(html)
+            .getElementsByClass(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME).first()?.text() == ""
+        if (bodyHasEmptyQuotes) {
+            doc.getElementsByClass(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME).forEach { it.remove() }
+        }
+
         // Remove the toggle button before saving
         doc.getElementById("quote-toggle-btn")?.remove()
         return doc.html()
diff --git a/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt b/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
index 85e7c24cf22..b1f910e18f5 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
@@ -219,6 +219,12 @@ class HtmlFormatter(private val html: String) {
             listOf(PRIMARY_COLOR_CODE to getAttributeColor(RAndroid.attr.colorPrimary)),
         )
 
+        fun Context.getCustomEditorStyle(): String = loadCss(
+            R.raw.editor_style,
+            listOf(PRIMARY_COLOR_CODE to getAttributeColor(RAndroid.attr.colorPrimary))
+        )
+
+
         fun Context.getSignatureMarginStyle(): String = loadCss(R.raw.signature_margins)
 
         fun Context.getPrintMailStyle(): String = loadCss(R.raw.print_email)
@@ -228,6 +234,10 @@ class HtmlFormatter(private val html: String) {
             listOf("MESSAGE_SELECTOR" to "#$KMAIL_MESSAGE_ID")
         )
 
+        fun Context.getToggleQuotesButtonVisibilityScript(): String = loadScript(
+            R.raw.toggle_quote_visibility_script
+        )
+
         fun Context.getFixStyleScript(): String {
             return loadScript(R.raw.fix_email_style)
         }
diff --git a/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
index 0b2c620c814..6d2fcfb7716 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
@@ -33,7 +33,6 @@ import com.infomaniak.mail.utils.HtmlFormatter.Companion.getImproveRenderingStyl
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getJsBridgeScript
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getPrintMailStyle
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getResizeScript
-import com.infomaniak.mail.utils.HtmlFormatter.Companion.getSignatureMarginStyle
 import com.infomaniak.mail.utils.extensions.enableAlgorithmicDarkening
 import com.infomaniak.mail.utils.extensions.loadCss
 import kotlin.math.abs
@@ -43,7 +42,6 @@ class WebViewUtils(context: Context) {
     private val customDarkMode by lazy { context.getCustomDarkMode() }
     private val improveRenderingStyle by lazy { context.getImproveRenderingStyle() }
     private val customStyle by lazy { context.getCustomStyle() }
-    private val signatureVerticalMargin by lazy { context.getSignatureMarginStyle() }
     private val printMailStyle by lazy { context.getPrintMailStyle() }
 
     private val resizeScript by lazy { context.getResizeScript() }
@@ -68,15 +66,6 @@ class WebViewUtils(context: Context) {
         return@with inject()
     }
 
-    fun processSignatureHtmlForDisplay(
-        html: String,
-        isDisplayedInDarkMode: Boolean,
-    ): String = with(HtmlFormatter(html)) {
-        addCommonDisplayContent(isDisplayedInDarkMode)
-        registerCss(signatureVerticalMargin)
-        return@with inject()
-    }
-
     private fun HtmlFormatter.addCommonDisplayContent(isDisplayedInDarkMode: Boolean) {
         if (isDisplayedInDarkMode) registerCss(customDarkMode, DARK_BACKGROUND_STYLE_ID)
         registerCss(improveRenderingStyle)
diff --git a/app/src/main/res/drawable/ic_more_horiz.xml b/app/src/main/res/drawable/ic_more_horiz.xml
new file mode 100644
index 00000000000..602d0daa2d0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more_horiz.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Infomaniak Mail - Android
+  ~ Copyright (C) 2026 Infomaniak Network SA
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0"
+    android:tint="@color/iconColor">
+    <path
+        android:fillColor="@color/iconColor"
+        android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+</vector>
+
diff --git a/app/src/main/res/layout/fragment_new_message.xml b/app/src/main/res/layout/fragment_new_message.xml
index ed47932abcf..4ae09d4a17a 100644
--- a/app/src/main/res/layout/fragment_new_message.xml
+++ b/app/src/main/res/layout/fragment_new_message.xml
@@ -318,6 +318,16 @@
                         app:layout_constraintTop_toTopOf="@id/editorWebView"
                         tools:visibility="visible" />
 
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/quotesToggleButton"
+                        style="@style/IconButtonSmall"
+                        android:layout_width="24dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="10dp"
+                        android:contentDescription="@string/buttonTextOptionsOpen"
+                        app:icon="@drawable/ic_more_horiz"
+                        app:layout_constraintStart_toStartOf="@id/editorWebView"
+                        app:layout_constraintTop_toBottomOf="@id/editorWebView" />
 
                     <LinearLayout
                         android:id="@+id/bodyLoader"
diff --git a/app/src/main/res/raw/signature_margins.css b/app/src/main/res/raw/signature_margins.css
index e109cffc86a..0b3cdb44ec1 100644
--- a/app/src/main/res/raw/signature_margins.css
+++ b/app/src/main/res/raw/signature_margins.css
@@ -1 +1 @@
-body { margin-top: 1rem; margin-bottom: 1rem; } /* Only one selector in the whole file is supported. Here it's `body` */
+.editorUserSignature { margin-top: 1rem; margin-bottom: 1rem; } /* Only one selector in the whole file is supported. Here it's `body` */
diff --git a/app/src/main/res/raw/style.css b/app/src/main/res/raw/style.css
index b1c3c4539e4..c08f649ecaa 100644
--- a/app/src/main/res/raw/style.css
+++ b/app/src/main/res/raw/style.css
@@ -12,27 +12,31 @@ body {
 }
 
 #ik-quotes, #ik-quotes > * {
-      max-width: 100% !important;
-      box-sizing: border-box !important;
-  }
-
-  #ik-quotes table {
-      width: auto !important;
-      max-width: 100% !important;
-  }
-
- #quote-toggle-btn {
-     background: none;
-     border: none;
-     cursor: pointer;
-     padding: 8px 12px;
-     display: flex;
-     align-items: center;
-     gap: 8px;
-     color: #666;
-     font-size: 13px;
-     font-weight: 500;
- }
+    max-width: 100% !important;
+    box-sizing: border-box !important;
+}
+
+#ik-quotes table {
+    width: auto !important;
+    max-width: 100% !important;
+}
+
+#quote-toggle-btn {
+    background: none;
+    border: none;
+    cursor: pointer;
+    padding: 8px 12px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    color: #666;
+    font-size: 13px;
+    font-weight: 500;
+}
+
+img {
+    max-width: 100% !important;
+}
 
 blockquote {
     padding: 0.2em 1.2em !important;
diff --git a/app/src/main/res/raw/toggle_quote_visibility_script.js b/app/src/main/res/raw/toggle_quote_visibility_script.js
index 5727a9745ec..2d19ce3f5f9 100644
--- a/app/src/main/res/raw/toggle_quote_visibility_script.js
+++ b/app/src/main/res/raw/toggle_quote_visibility_script.js
@@ -1,7 +1,6 @@
 (function() {
     function changeQuoteVisibility() {
         const button = document.getElementById('quote-toggle-btn');
-        console.log("BUTTON", button)
         if (!button) return;
 
         // Hide quotes initially and show toggle button
@@ -14,11 +13,20 @@
             button.style.display = 'block';
         }
 
-        // Attach click handler to button
         button.onclick = function(e) {
            e.preventDefault();
            quoteElements.forEach(el => {
-              el.style.display = 'block';
+                el.style.display = 'block';
+                // Force reload images inside quotes
+                el.querySelectorAll('img').forEach(img => {
+                    if (img.src.startsWith('cid:')) {
+                    // Store original CID, then reload
+                    const cid = img.src;
+                    img.src = '';
+
+                    setTimeout(() => img.src = cid, 0);
+                    }
+                });
            });
            button.style.display = 'none';
         };

From eb7f4fa892f6ecd70c7e229b021246b8ce38c2d8 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Mon, 2 Mar 2026 14:54:14 +0100
Subject: [PATCH 17/94] feat: Change 3 dots for text button and fix ai PR
 suggestions

---
 .../mail/ui/newMessage/NewMessageFragment.kt  | 72 ++++++++-----------
 .../NewMessageRecipientFieldsManager.kt       | 10 ++-
 .../mail/ui/newMessage/NewMessageViewModel.kt | 38 +++++-----
 .../infomaniak/mail/utils/HtmlFormatter.kt    | 13 +++-
 .../infomaniak/mail/utils/MessageBodyUtils.kt | 14 +---
 .../infomaniak/mail/utils/SignatureUtils.kt   |  6 +-
 .../com/infomaniak/mail/utils/WebViewUtils.kt |  6 +-
 app/src/main/res/drawable/ic_more_horiz.xml   | 28 --------
 .../main/res/layout/fragment_new_message.xml  | 14 ++--
 app/src/main/res/raw/editor_style.css         |  5 +-
 .../main/res/raw/replace_signature_script.js  | 36 ++++++++++
 app/src/main/res/raw/show_quotes_script.js    | 35 +++++++++
 app/src/main/res/raw/signature_margins.css    |  2 +-
 app/src/main/res/raw/style.css                | 13 ----
 .../res/raw/toggle_quote_visibility_script.js | 36 ----------
 15 files changed, 158 insertions(+), 170 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_more_horiz.xml
 create mode 100644 app/src/main/res/raw/replace_signature_script.js
 create mode 100644 app/src/main/res/raw/show_quotes_script.js
 delete mode 100644 app/src/main/res/raw/toggle_quote_visibility_script.js

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 9881ccf01ff..d37b4ab7dd4 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -88,15 +88,16 @@ import com.infomaniak.mail.ui.newMessage.NewMessageViewModel.UiFrom
 import com.infomaniak.mail.ui.newMessage.encryption.EncryptionMessageManager
 import com.infomaniak.mail.ui.newMessage.encryption.EncryptionViewModel
 import com.infomaniak.mail.utils.AccountUtils
+import com.infomaniak.mail.utils.HtmlFormatter.Companion.escapeForJS
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getCustomDarkMode
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getCustomEditorStyle
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getCustomStyle
+import com.infomaniak.mail.utils.HtmlFormatter.Companion.getReplaceSignatureScript
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getSignatureMarginStyle
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getToggleQuotesButtonVisibilityScript
 import com.infomaniak.mail.utils.MessageBodyUtils
 import com.infomaniak.mail.utils.SentryDebug
 import com.infomaniak.mail.utils.SignatureUtils
-import com.infomaniak.mail.utils.WebViewUtils
 import com.infomaniak.mail.utils.WebViewUtils.Companion.setupNewMessageWebViewSettings
 import com.infomaniak.mail.utils.extensions.AttachmentExt
 import com.infomaniak.mail.utils.extensions.AttachmentExt.openAttachment
@@ -149,7 +150,6 @@ class NewMessageFragment : Fragment() {
     private val attachmentAdapter inline get() = binding.attachmentsRecyclerView.adapter as AttachmentAdapter
 
     private val newMessageActivity by lazy { requireActivity() as NewMessageActivity }
-    private val webViewUtils by lazy { WebViewUtils(requireContext()) }
 
     @Inject
     lateinit var editorContentManager: EditorContentManager
@@ -187,7 +187,6 @@ class NewMessageFragment : Fragment() {
     @Inject
     lateinit var dateAndTimeScheduleDialog: SelectDateAndTimeForScheduledDraftDialog
 
-
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         return FragmentNewMessageBinding.inflate(inflater, container, false).also { _binding = it }.root
     }
@@ -468,7 +467,7 @@ class NewMessageFragment : Fragment() {
                 if (draft != null) {
                     val isBodyEmpty = newMessageViewModel.bodyHasPlaceholder(draft.body)
                     binding.newMessagePlaceholder.isVisible = isBodyEmpty
-                    showKeyboardInCorrectView(isToFieldEmpty = draft.to.isEmpty(), isBodyEmpty = isBodyEmpty)
+                    showKeyboardInCorrectView(isToFieldEmpty = draft.to.isEmpty())
                     binding.subjectTextField.setText(draft.subject)
                 } else {
                     requireActivity().apply {
@@ -480,10 +479,10 @@ class NewMessageFragment : Fragment() {
         }
     }
 
-    private fun showKeyboardInCorrectView(isToFieldEmpty: Boolean, isBodyEmpty: Boolean) = with(recipientFieldsManager) {
+    private fun showKeyboardInCorrectView(isToFieldEmpty: Boolean) = with(recipientFieldsManager) {
         when (newMessageViewModel.draftMode()) {
             DraftMode.REPLY,
-            DraftMode.REPLY_ALL -> if (isBodyEmpty) focusBodyField()
+            DraftMode.REPLY_ALL -> focusBodyField()
             DraftMode.FORWARD -> focusToField()
             DraftMode.NEW_MAIL -> if (isToFieldEmpty) focusToField() else focusBodyField()
         }
@@ -491,13 +490,22 @@ class NewMessageFragment : Fragment() {
 
     private fun configureUiWithDraftData(draft: Draft) = with(binding.editorWebView) {
         settings.setupNewMessageWebViewSettings()
-        webViewClient =
-            initWebViewClientAndBridge(
-                attachments = draft.attachments,
-                messageUid = "MESSAGE-" + draft.messageUid,
-                shouldLoadDistantResources = true,
-                navigateToNewMessageActivity = null
-            )
+        webViewClient = initWebViewClientAndBridge(
+            attachments = draft.attachments,
+            messageUid = "MESSAGE-" + draft.messageUid,
+            shouldLoadDistantResources = true,
+            navigateToNewMessageActivity = null
+        )
+    }
+
+    private fun setupToggleQuotesButton() {
+        binding.quotesToggleButton.isVisible = newMessageViewModel.areQuotesVisible.value
+        binding.quotesToggleButton.setOnClickListener {
+            binding.editorWebView.evaluateJavascript(requireContext().getToggleQuotesButtonVisibilityScript()) {
+                binding.quotesToggleButton.isGone = true
+                newMessageViewModel.changeQuotesVisibility(areVisible = true)
+            }
+        }
     }
 
     private fun setupFromField(signatures: List<Signature>) = with(binding) {
@@ -539,36 +547,16 @@ class NewMessageFragment : Fragment() {
         val wrappedNewSignature =
             if (signature.isDummy) "" else signatureUtils.encapsulateSignatureContentWithInfomaniakClass(newSignatureHtml)
 
-        val escapedSignature = wrappedNewSignature
-            .replace("\\", "\\\\")
-            .replace("\"", "\\\"")
-            .replace("\n", "\\n")
-            .replace("\r", "\\r")
-
-        val replaceSignatureScript = """
-        (function() {
-            var sigElement = document.querySelector('.${MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_CLASS_NAME}');
-            var newSigHtml = "$escapedSignature";
-            if (sigElement) {
-                if (newSigHtml === "") {
-                    sigElement.remove();
-                } else {
-                    sigElement.outerHTML = newSigHtml;
-                }
-            } else if (newSigHtml !== "") {
-                var quotes = document.querySelector('.${MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME}');
-                if (quotes) {
-                    quotes.insertAdjacentHTML('beforebegin', newSigHtml);
-                } else {
-                    document.body.insertAdjacentHTML('beforeend', newSigHtml);
-                }
-            }
-        })()
-    """.trimIndent()
+        val escapedSignature = wrappedNewSignature.escapeForJS()
+
+        val replaceSignatureScript = requireContext().getReplaceSignatureScript().format(
+            MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_CLASS_NAME,
+            escapedSignature,
+            MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME
+        )
 
         binding.editorWebView.evaluateJavascript(replaceSignatureScript) {
-            newMessageViewModel.fromLiveData.value =
-                UiFrom(signature)
+            newMessageViewModel.fromLiveData.value = UiFrom(signature)
             addressListPopupWindow?.dismiss()
         }
     }
@@ -698,7 +686,7 @@ class NewMessageFragment : Fragment() {
     private fun observeBodyLoader() {
         newMessageViewModel.editorBodyInitializer.observe(viewLifecycleOwner) { body ->
             editorContentManager.setContent(binding.editorWebView, body)
-            binding.editorWebView.addScript(requireContext().getToggleQuotesButtonVisibilityScript())
+            setupToggleQuotesButton()
         }
     }
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageRecipientFieldsManager.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageRecipientFieldsManager.kt
index 65d6cd6c209..7026f402f11 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageRecipientFieldsManager.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageRecipientFieldsManager.kt
@@ -157,7 +157,15 @@ class NewMessageRecipientFieldsManager @Inject constructor(private val snackbarM
 
     fun setOnFocusChangedListeners() = with(newMessageViewModel) {
         binding.subjectTextField.setOnFocusChangeListener { _, hasFocus -> if (hasFocus) fieldGotFocus(field = null) }
-        binding.editorWebView.setOnFocusChangeListener { _, hasFocus -> isEditorWebViewFocusedLiveData.value = hasFocus }
+        binding.editorWebView.setOnFocusChangeListener { _, hasFocus ->
+            isEditorWebViewFocusedLiveData.value = hasFocus
+            if (hasFocus) {
+                binding.editorWebView.post {
+                    binding.editorWebView.scrollTo(0, 0)
+                    binding.compositionNestedScrollView.scrollTo(0, 0)
+                }
+            }
+        }
 
         isEditorWebViewFocusedLiveData.observe(viewLifecycleOwner) { hasFocus -> if (hasFocus) fieldGotFocus(field = null) }
     }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index 7cd7116a16a..3139390682e 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -24,7 +24,6 @@ import android.content.ClipDescription
 import android.content.Intent
 import android.net.Uri
 import android.os.Parcelable
-import android.util.Log
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.net.MailTo
 import androidx.core.net.toUri
@@ -88,7 +87,6 @@ import com.infomaniak.mail.utils.JsoupParserUtil
 import com.infomaniak.mail.utils.JsoupParserUtil.jsoupParseWithLog
 import com.infomaniak.mail.utils.LocalStorageUtils
 import com.infomaniak.mail.utils.MessageBodyUtils
-import com.infomaniak.mail.utils.MessageBodyUtils.toggleButton
 import com.infomaniak.mail.utils.SentryDebug
 import com.infomaniak.mail.utils.SharedUtils
 import com.infomaniak.mail.utils.SignatureUtils
@@ -223,6 +221,9 @@ class NewMessageViewModel @Inject constructor(
     private val _isShimmering = MutableStateFlow(true)
     val isShimmering: StateFlow<Boolean> = _isShimmering
 
+    private val _areQuotesVisible = MutableStateFlow(false)
+    val areQuotesVisible: StateFlow<Boolean> = _areQuotesVisible
+
     //region Check mailbox existence
     private val exitSignal: CompletableJob = Job()
 
@@ -560,16 +561,13 @@ class NewMessageViewModel @Inject constructor(
         }
 
         if (isNewMessage && !initialQuote.isNullOrEmpty()) {
+            _areQuotesVisible.emit(true)
             finalBodyContent += MessageBodyUtils.encapsulateQuotesWithInfomaniakClass(initialQuote.toString())
         }
 
-        var normalizedBody = normalizeHtml(finalBodyContent)
+        val normalizedBody = normalizeHtml(finalBodyContent)
         saveSnapshot(normalizedBody)
 
-        if (bodyHasQuotes(finalBodyContent)) {
-            normalizedBody += toggleButton()
-        }
-
         editorBodyInitializer.postValue(
             BodyContentPayload(
                 content = normalizedBody,
@@ -587,15 +585,11 @@ class NewMessageViewModel @Inject constructor(
 
     fun bodyHasPlaceholder(bodyHtml: String): Boolean {
         val body = JsoupParserUtil.jsoupParseBodyFragmentWithLog(bodyHtml).body()
-        return body.text() == ""
+        return !body.hasText()
     }
 
-    fun bodyHasQuotes(bodyHtml: String): Boolean {
-        val bodyHasQuotes = JsoupParserUtil.jsoupParseBodyFragmentWithLog(bodyHtml)
-            .getElementsByClass(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME).count() > 0
-        val toggleButtonAlreadyExists = JsoupParserUtil.jsoupParseBodyFragmentWithLog(bodyHtml)
-            .getElementById("quote-toggle-btn") != null
-        return bodyHasQuotes && !toggleButtonAlreadyExists
+    fun changeQuotesVisibility(areVisible: Boolean) {
+        _areQuotesVisible.value = areVisible
     }
 
     private fun normalizeHtml(html: String): String {
@@ -1022,15 +1016,17 @@ class NewMessageViewModel @Inject constructor(
 
     private fun sanitizeBody(html: String): String {
         val doc = jsoupParseWithLog(html)
-        // If the user deleted the quotes text, remove the quotes div.
-        val bodyHasEmptyQuotes = JsoupParserUtil.jsoupParseBodyFragmentWithLog(html)
-            .getElementsByClass(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME).first()?.text() == ""
-        if (bodyHasEmptyQuotes) {
+        // If the user deleted the quotes text, remove the quotes div so the button to show quotes doesn't show.
+        val quotes = JsoupParserUtil.jsoupParseBodyFragmentWithLog(html)
+            .getElementsByClass(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME)
+        val hasQuotes = quotes.isNotEmpty()
+        if (hasQuotes && !quotes.hasText()) {
             doc.getElementsByClass(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME).forEach { it.remove() }
         }
 
-        // Remove the toggle button before saving
-        doc.getElementById("quote-toggle-btn")?.remove()
+        // Don't save the draft or send the mail with quotes style display none.
+        if (hasQuotes) quotes.attr("style", "display: block")
+
         return doc.html()
     }
 
@@ -1073,8 +1069,6 @@ class NewMessageViewModel @Inject constructor(
     }
 
     private fun isSnapshotTheSame(subjectValue: String?, uiBodyValue: String): Boolean {
-        Log.d("BODY VALUE", uiBodyValue)
-        Log.d("SNAPSHOT", snapshot?.uiBody.toString())
         return snapshot?.let { draftSnapshot ->
             draftSnapshot.identityId == fromLiveData.value?.signature?.id?.toString() &&
                     draftSnapshot.to == toLiveData.valueOrEmpty().toSet() &&
diff --git a/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt b/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
index b1f910e18f5..f93026d27bd 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
@@ -27,6 +27,7 @@ import com.infomaniak.mail.utils.UiUtils.PRIMARY_COLOR_CODE
 import com.infomaniak.mail.utils.extensions.getAttributeColor
 import com.infomaniak.mail.utils.extensions.loadCss
 import com.infomaniak.mail.utils.extensions.readRawResource
+import kotlinx.serialization.json.JsonPrimitive
 import org.jsoup.nodes.Element
 import org.jsoup.nodes.Node
 import org.jsoup.nodes.TextNode
@@ -210,6 +211,11 @@ class HtmlFormatter(private val html: String) {
             }
         }
 
+        fun String.escapeForJS(): String {
+            if (isNullOrEmpty()) return this
+            return JsonPrimitive(this).toString().removeSurrounding("\"")
+        }
+
         fun Context.getCustomDarkMode(): String = loadCss(R.raw.custom_dark_mode)
 
         fun Context.getImproveRenderingStyle(): String = loadCss(R.raw.improve_rendering)
@@ -224,7 +230,6 @@ class HtmlFormatter(private val html: String) {
             listOf(PRIMARY_COLOR_CODE to getAttributeColor(RAndroid.attr.colorPrimary))
         )
 
-
         fun Context.getSignatureMarginStyle(): String = loadCss(R.raw.signature_margins)
 
         fun Context.getPrintMailStyle(): String = loadCss(R.raw.print_email)
@@ -235,7 +240,11 @@ class HtmlFormatter(private val html: String) {
         )
 
         fun Context.getToggleQuotesButtonVisibilityScript(): String = loadScript(
-            R.raw.toggle_quote_visibility_script
+            R.raw.show_quotes_script
+        )
+
+        fun Context.getReplaceSignatureScript(): String = loadScript(
+            R.raw.replace_signature_script
         )
 
         fun Context.getFixStyleScript(): String {
diff --git a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
index 6f43b96b2a7..6b5486f0fb2 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
@@ -64,19 +64,7 @@ object MessageBodyUtils {
     )
 
     fun encapsulateQuotesWithInfomaniakClass(quotes: String): String {
-        return """<div class=$INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME spellcheck=false>$quotes<br></div>""".trimIndent()
-    }
-
-    fun toggleButton(): String {
-        return """
-        <button id="quote-toggle-btn" type="button" title="Show quoted text">
-            <svg width="20" height="20" viewBox="0 0 24 24" fill="currentColor">
-                <circle cx="5" cy="12" r="2"/>
-                <circle cx="12" cy="12" r="2"/>
-                <circle cx="19" cy="12" r="2"/>
-            </svg>
-        </button>
-        """.trimIndent()
+        return """<div class="$INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME" spellcheck="false">$quotes<br></div>""".trimIndent()
     }
 
     suspend fun splitContentAndQuote(body: Body): SplitBody {
diff --git a/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt
index 65f8f0a4821..6041ff26004 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt
@@ -32,6 +32,8 @@ class SignatureUtils @Inject constructor(appContext: Context) {
     fun encapsulateSignatureContentWithInfomaniakClass(signatureContent: String): String {
         val verticalMarginsCss = signatureMargins
         val verticalMarginAttributes = extractAttributesFromMarginCss(verticalMarginsCss)
+        if (verticalMarginAttributes.isNullOrEmpty()) return signatureContent
+
         return """
             <div class="$INFOMANIAK_SIGNATURE_HTML_CLASS_NAME" spellcheck="false" style="$verticalMarginAttributes">
             $signatureContent
@@ -39,7 +41,7 @@ class SignatureUtils @Inject constructor(appContext: Context) {
         """.trimIndent()
     }
 
-    private fun extractAttributesFromMarginCss(verticalMarginsCss: String): String {
-        return Regex("""\{(.*)\}""").find(verticalMarginsCss)!!.groupValues[1]
+    private fun extractAttributesFromMarginCss(verticalMarginsCss: String): String? {
+        return Regex("""\{(.*)\}""").find(verticalMarginsCss)?.groupValues[1]
     }
 }
diff --git a/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
index 6d2fcfb7716..1a4e02d9967 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
@@ -126,14 +126,14 @@ class WebViewUtils(context: Context) {
         private fun WebSettings.setupCommonWebViewSettings() {
             @SuppressLint("SetJavaScriptEnabled")
             javaScriptEnabled = true
-
+            loadWithOverviewMode = true
             cacheMode = LOAD_CACHE_ELSE_NETWORK
         }
 
         fun WebSettings.setupThreadWebViewSettings() {
             setupCommonWebViewSettings()
-
-            loadWithOverviewMode = true
+            
+            useWideViewPort = true
             setSupportZoom(true)
             builtInZoomControls = true
             displayZoomControls = false
diff --git a/app/src/main/res/drawable/ic_more_horiz.xml b/app/src/main/res/drawable/ic_more_horiz.xml
deleted file mode 100644
index 602d0daa2d0..00000000000
--- a/app/src/main/res/drawable/ic_more_horiz.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Infomaniak Mail - Android
-  ~ Copyright (C) 2026 Infomaniak Network SA
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0"
-    android:tint="@color/iconColor">
-    <path
-        android:fillColor="@color/iconColor"
-        android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
-</vector>
-
diff --git a/app/src/main/res/layout/fragment_new_message.xml b/app/src/main/res/layout/fragment_new_message.xml
index 4ae09d4a17a..c766a7cbb37 100644
--- a/app/src/main/res/layout/fragment_new_message.xml
+++ b/app/src/main/res/layout/fragment_new_message.xml
@@ -320,14 +320,16 @@
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/quotesToggleButton"
-                        style="@style/IconButtonSmall"
-                        android:layout_width="24dp"
+                        style="@style/TextButton"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="10dp"
-                        android:contentDescription="@string/buttonTextOptionsOpen"
-                        app:icon="@drawable/ic_more_horiz"
-                        app:layout_constraintStart_toStartOf="@id/editorWebView"
-                        app:layout_constraintTop_toBottomOf="@id/editorWebView" />
+                        android:padding="@dimen/marginStandardVerySmall"
+                        android:text="@string/messageShowQuotedText"
+                        android:visibility="gone"
+                        app:layout_constraintStart_toStartOf="@id/postFields"
+                        app:layout_constraintTop_toBottomOf="@id/editorWebView"
+                        tools:visibility="visible" />
 
                     <LinearLayout
                         android:id="@+id/bodyLoader"
diff --git a/app/src/main/res/raw/editor_style.css b/app/src/main/res/raw/editor_style.css
index 1e263ed9804..2f9d2a238e0 100644
--- a/app/src/main/res/raw/editor_style.css
+++ b/app/src/main/res/raw/editor_style.css
@@ -13,4 +13,7 @@ p {
     margin: 0;
 }
 
-
+.ik_mail_quote, forwardContentMessage {
+    display: none;
+    overflow-x: auto !important;
+}
diff --git a/app/src/main/res/raw/replace_signature_script.js b/app/src/main/res/raw/replace_signature_script.js
new file mode 100644
index 00000000000..c1da757990a
--- /dev/null
+++ b/app/src/main/res/raw/replace_signature_script.js
@@ -0,0 +1,36 @@
+/*
+ * Infomaniak Mail - Android
+ * Copyright (C) 2026 Infomaniak Network SA
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+(function() {
+    var signatureElement = document.querySelector('.%s');
+    var newSigHtml = "%s";
+    if (signatureElement) {
+        if (newSigHtml === "") {
+            signatureElement.remove();
+        } else {
+            signatureElement.outerHTML = newSigHtml;
+        }
+    } else if (newSigHtml !== "") {
+        var quotes = document.querySelector('.%s');
+        if (quotes) {
+            quotes.insertAdjacentHTML('beforebegin', newSigHtml);
+        } else {
+            document.body.insertAdjacentHTML('beforeend', newSigHtml);
+        }
+    }
+})()
diff --git a/app/src/main/res/raw/show_quotes_script.js b/app/src/main/res/raw/show_quotes_script.js
new file mode 100644
index 00000000000..b713cbee543
--- /dev/null
+++ b/app/src/main/res/raw/show_quotes_script.js
@@ -0,0 +1,35 @@
+/*
+ * Infomaniak Mail - Android
+ * Copyright (C) 2026 Infomaniak Network SA
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+(function() {
+  const quoteElements = document.querySelectorAll('.ik_mail_quote');
+  quoteElements.forEach(el => {
+       el.style.display = 'block';
+
+       // Force reload images inside quotes
+       el.querySelectorAll('img').forEach(img => {
+         if (img.src.startsWith('cid:')) {
+            // Store original CID, then reload
+             const cid = img.src;
+             img.src = '';
+
+             setTimeout(() => img.src = cid, 0);
+         }
+       });
+  });
+})();
diff --git a/app/src/main/res/raw/signature_margins.css b/app/src/main/res/raw/signature_margins.css
index 0b3cdb44ec1..0e4ce4ba37c 100644
--- a/app/src/main/res/raw/signature_margins.css
+++ b/app/src/main/res/raw/signature_margins.css
@@ -1 +1 @@
-.editorUserSignature { margin-top: 1rem; margin-bottom: 1rem; } /* Only one selector in the whole file is supported. Here it's `body` */
+.editorUserSignature { margin-top: 1rem; margin-bottom: 1rem; } /* Only one selector in the whole file is supported. */
diff --git a/app/src/main/res/raw/style.css b/app/src/main/res/raw/style.css
index c08f649ecaa..70880b5bbf2 100644
--- a/app/src/main/res/raw/style.css
+++ b/app/src/main/res/raw/style.css
@@ -21,19 +21,6 @@ body {
     max-width: 100% !important;
 }
 
-#quote-toggle-btn {
-    background: none;
-    border: none;
-    cursor: pointer;
-    padding: 8px 12px;
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    color: #666;
-    font-size: 13px;
-    font-weight: 500;
-}
-
 img {
     max-width: 100% !important;
 }
diff --git a/app/src/main/res/raw/toggle_quote_visibility_script.js b/app/src/main/res/raw/toggle_quote_visibility_script.js
deleted file mode 100644
index 2d19ce3f5f9..00000000000
--- a/app/src/main/res/raw/toggle_quote_visibility_script.js
+++ /dev/null
@@ -1,36 +0,0 @@
-(function() {
-    function changeQuoteVisibility() {
-        const button = document.getElementById('quote-toggle-btn');
-        if (!button) return;
-
-        // Hide quotes initially and show toggle button
-        const quoteElements = document.querySelectorAll('.ik_mail_quote');
-
-        if (quoteElements.style != 'block') {
-            quoteElements.forEach(el => {
-                el.style.display = 'none';
-            });
-            button.style.display = 'block';
-        }
-
-        button.onclick = function(e) {
-           e.preventDefault();
-           quoteElements.forEach(el => {
-                el.style.display = 'block';
-                // Force reload images inside quotes
-                el.querySelectorAll('img').forEach(img => {
-                    if (img.src.startsWith('cid:')) {
-                    // Store original CID, then reload
-                    const cid = img.src;
-                    img.src = '';
-
-                    setTimeout(() => img.src = cid, 0);
-                    }
-                });
-           });
-           button.style.display = 'none';
-        };
-    }
-
-    changeQuoteVisibility();
-})();

From cf78338f5c45867a76a13843da553657c9ed0ca9 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Mon, 2 Mar 2026 15:11:40 +0100
Subject: [PATCH 18/94] fix: Fix sonar issues and add more margin to signature

---
 .../ui/newMessage/NewMessageRecipientFieldsManager.kt  | 10 +---------
 app/src/main/res/raw/editor_style.css                  |  2 +-
 app/src/main/res/raw/show_quotes_script.js             |  2 +-
 app/src/main/res/raw/signature_margins.css             |  2 +-
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageRecipientFieldsManager.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageRecipientFieldsManager.kt
index 7026f402f11..65d6cd6c209 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageRecipientFieldsManager.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageRecipientFieldsManager.kt
@@ -157,15 +157,7 @@ class NewMessageRecipientFieldsManager @Inject constructor(private val snackbarM
 
     fun setOnFocusChangedListeners() = with(newMessageViewModel) {
         binding.subjectTextField.setOnFocusChangeListener { _, hasFocus -> if (hasFocus) fieldGotFocus(field = null) }
-        binding.editorWebView.setOnFocusChangeListener { _, hasFocus ->
-            isEditorWebViewFocusedLiveData.value = hasFocus
-            if (hasFocus) {
-                binding.editorWebView.post {
-                    binding.editorWebView.scrollTo(0, 0)
-                    binding.compositionNestedScrollView.scrollTo(0, 0)
-                }
-            }
-        }
+        binding.editorWebView.setOnFocusChangeListener { _, hasFocus -> isEditorWebViewFocusedLiveData.value = hasFocus }
 
         isEditorWebViewFocusedLiveData.observe(viewLifecycleOwner) { hasFocus -> if (hasFocus) fieldGotFocus(field = null) }
     }
diff --git a/app/src/main/res/raw/editor_style.css b/app/src/main/res/raw/editor_style.css
index 2f9d2a238e0..1341eaab723 100644
--- a/app/src/main/res/raw/editor_style.css
+++ b/app/src/main/res/raw/editor_style.css
@@ -13,7 +13,7 @@ p {
     margin: 0;
 }
 
-.ik_mail_quote, forwardContentMessage {
+.ik_mail_quote, .forwardContentMessage {
     display: none;
     overflow-x: auto !important;
 }
diff --git a/app/src/main/res/raw/show_quotes_script.js b/app/src/main/res/raw/show_quotes_script.js
index b713cbee543..b4b42db1a61 100644
--- a/app/src/main/res/raw/show_quotes_script.js
+++ b/app/src/main/res/raw/show_quotes_script.js
@@ -17,7 +17,7 @@
  */
 
 (function() {
-  const quoteElements = document.querySelectorAll('.ik_mail_quote');
+  const quoteElements = document.querySelectorAll('.ik_mail_quote, .forwardContentMessage');
   quoteElements.forEach(el => {
        el.style.display = 'block';
 
diff --git a/app/src/main/res/raw/signature_margins.css b/app/src/main/res/raw/signature_margins.css
index 0e4ce4ba37c..97fa30eda43 100644
--- a/app/src/main/res/raw/signature_margins.css
+++ b/app/src/main/res/raw/signature_margins.css
@@ -1 +1 @@
-.editorUserSignature { margin-top: 1rem; margin-bottom: 1rem; } /* Only one selector in the whole file is supported. */
+.editorUserSignature { margin-top: 3rem; margin-bottom: 1rem; } /* Only one selector in the whole file is supported. */

From 38a7e31208d997917890f6f12bf5fbee6262245f Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Tue, 3 Mar 2026 13:55:20 +0100
Subject: [PATCH 19/94] refactor: Refactor for PR

---
 .../data/cache/mailboxContent/ReplyForwardFooterManager.kt    | 1 +
 .../com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt   | 2 +-
 .../com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt   | 4 +---
 app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt   | 2 +-
 app/src/main/res/raw/signature_margins.css                    | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ReplyForwardFooterManager.kt b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ReplyForwardFooterManager.kt
index 9f29f544cf9..a6ef02ed183 100644
--- a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ReplyForwardFooterManager.kt
+++ b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ReplyForwardFooterManager.kt
@@ -53,6 +53,7 @@ class ReplyForwardFooterManager @Inject constructor(private val appContext: Cont
                     imageElement.attr(SRC_ATTRIBUTE, "${CID_PROTOCOL}$newContentId")
                 },
             )
+            
             document.outerHtml()
         } ?: ""
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt
index f445b35b1e1..77336cf1251 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt
@@ -27,7 +27,7 @@ data class BodyContentPayload(val content: String, val type: BodyContentType) {
         fun emptyBody() =
             BodyContentPayload(
                 content = "<br id=lineBreakAtBeginningOfSignature>",
-                type = BodyContentType.TEXT_PLAIN_WITHOUT_HTML
+                type = BodyContentType.HTML_SANITIZED
             )
     }
 }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index d37b4ab7dd4..8d4d97c167a 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -138,7 +138,6 @@ class NewMessageFragment : Fragment() {
     private val newMessageViewModel: NewMessageViewModel by activityViewModels()
     private val aiViewModel: AiViewModel by activityViewModels()
     private val encryptionViewModel: EncryptionViewModel by activityViewModels()
-    private var hasPlaceholder = true
 
     private val filePicker = FilePicker(fragment = this).apply {
         initCallback { uris -> newMessageViewModel.importAttachmentsLiveData.value = uris }
@@ -445,13 +444,12 @@ class NewMessageFragment : Fragment() {
 
     private fun removePlaceholder() {
         binding.newMessagePlaceholder.visibility = View.GONE
-        hasPlaceholder = false
     }
 
     private fun handleFocusChanges() {
         newMessageViewModel.isEditorWebViewFocusedLiveData.observe(viewLifecycleOwner) { isFocused ->
             setToolbarEnabledStatus(isFocused)
-            if (isFocused && hasPlaceholder) {
+            if (isFocused && binding.newMessagePlaceholder.isVisible) {
                 removePlaceholder()
             }
         }
diff --git a/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
index 1a4e02d9967..0475f06e168 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
@@ -132,7 +132,7 @@ class WebViewUtils(context: Context) {
 
         fun WebSettings.setupThreadWebViewSettings() {
             setupCommonWebViewSettings()
-            
+
             useWideViewPort = true
             setSupportZoom(true)
             builtInZoomControls = true
diff --git a/app/src/main/res/raw/signature_margins.css b/app/src/main/res/raw/signature_margins.css
index 97fa30eda43..bb22fc91a9d 100644
--- a/app/src/main/res/raw/signature_margins.css
+++ b/app/src/main/res/raw/signature_margins.css
@@ -1 +1 @@
-.editorUserSignature { margin-top: 3rem; margin-bottom: 1rem; } /* Only one selector in the whole file is supported. */
+.editorUserSignature { margin-top: 1.5rem; margin-bottom: 1rem; } /* Only one selector in the whole file is supported. */

From f438f6a534ed04d1ad5753ea4c4f9cb51e1925bd Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Tue, 3 Mar 2026 14:16:57 +0100
Subject: [PATCH 20/94] fix: Remove unnecesary space

---
 .../mail/data/cache/mailboxContent/ReplyForwardFooterManager.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ReplyForwardFooterManager.kt b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ReplyForwardFooterManager.kt
index a6ef02ed183..95807dc5c79 100644
--- a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ReplyForwardFooterManager.kt
+++ b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ReplyForwardFooterManager.kt
@@ -53,7 +53,7 @@ class ReplyForwardFooterManager @Inject constructor(private val appContext: Cont
                     imageElement.attr(SRC_ATTRIBUTE, "${CID_PROTOCOL}$newContentId")
                 },
             )
-            
+
             document.outerHtml()
         } ?: ""
 

From 698b303da54e1f3720a3fa00dc02770f0865eb8b Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Mon, 9 Mar 2026 16:21:52 +0100
Subject: [PATCH 21/94] fix: Fix PR comments

---
 .../ReplyForwardFooterManager.kt              |   4 +-
 .../mail/ui/newMessage/BodyContentPayload.kt  |   3 +-
 .../mail/ui/newMessage/NewMessageFragment.kt  |  40 ++---
 .../mail/ui/newMessage/NewMessageViewModel.kt | 143 ++++++++----------
 .../infomaniak/mail/utils/HtmlFormatter.kt    |  19 ++-
 .../infomaniak/mail/utils/MessageBodyUtils.kt |   5 +-
 .../infomaniak/mail/utils/SignatureUtils.kt   |  18 +--
 .../com/infomaniak/mail/utils/WebViewUtils.kt |   2 +-
 .../mail/utils/extensions/Extensions.kt       |  12 ++
 .../main/res/layout/fragment_new_message.xml  |   4 +-
 .../main/res/raw/add_style_with_id_script.js  |   6 +
 app/src/main/res/raw/editor_style.css         |  11 --
 app/src/main/res/raw/hide_quotes_style.css    |   4 +
 app/src/main/res/raw/show_quotes_script.js    |  14 +-
 app/src/main/res/raw/signature_margins.css    |   1 -
 15 files changed, 141 insertions(+), 145 deletions(-)
 create mode 100644 app/src/main/res/raw/add_style_with_id_script.js
 create mode 100644 app/src/main/res/raw/hide_quotes_style.css
 delete mode 100644 app/src/main/res/raw/signature_margins.css

diff --git a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ReplyForwardFooterManager.kt b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ReplyForwardFooterManager.kt
index 95807dc5c79..41c80768768 100644
--- a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ReplyForwardFooterManager.kt
+++ b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ReplyForwardFooterManager.kt
@@ -125,17 +125,19 @@ class ReplyForwardFooterManager @Inject constructor(private val appContext: Cont
             addAndEscapeTextLine("")
 
             addAlreadyEscapedBody(previousFullBody)
+            addAndEscapeTextLine("")
         }.outerHtml()
     }
 
     private fun assembleReplyHtmlFooter(messageReplyHeader: String, previousFullBody: String): String {
-        val replyRoot = """<div class="${MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME}" />"""
+        val replyRoot = """<div class="${MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME}" spellcheck="false" />"""
         return parseAndWrapElementInNewDocument(replyRoot).apply {
             addAndEscapeTextLine("")
             addAndEscapeTextLine(messageReplyHeader, endWithBr = false)
             addReplyBlockQuote {
                 addAlreadyEscapedBody(previousFullBody)
             }
+            addAndEscapeTextLine("")
         }.outerHtml()
     }
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt
index 77336cf1251..6366a2e329e 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt
@@ -24,9 +24,10 @@ package com.infomaniak.mail.ui.newMessage
 data class BodyContentPayload(val content: String, val type: BodyContentType) {
 
     companion object {
+        // Add some empty lines in the body so the body focus on these lines and not in the signature
         fun emptyBody() =
             BodyContentPayload(
-                content = "<br id=lineBreakAtBeginningOfSignature>",
+                content = "<br/><br/>",
                 type = BodyContentType.HTML_SANITIZED
             )
     }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 8d4d97c167a..66e7946c791 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -92,8 +92,8 @@ import com.infomaniak.mail.utils.HtmlFormatter.Companion.escapeForJS
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getCustomDarkMode
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getCustomEditorStyle
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getCustomStyle
+import com.infomaniak.mail.utils.HtmlFormatter.Companion.getHideQuotesStyle
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getReplaceSignatureScript
-import com.infomaniak.mail.utils.HtmlFormatter.Companion.getSignatureMarginStyle
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getToggleQuotesButtonVisibilityScript
 import com.infomaniak.mail.utils.MessageBodyUtils
 import com.infomaniak.mail.utils.SentryDebug
@@ -101,6 +101,7 @@ import com.infomaniak.mail.utils.SignatureUtils
 import com.infomaniak.mail.utils.WebViewUtils.Companion.setupNewMessageWebViewSettings
 import com.infomaniak.mail.utils.extensions.AttachmentExt
 import com.infomaniak.mail.utils.extensions.AttachmentExt.openAttachment
+import com.infomaniak.mail.utils.extensions.addCssWithId
 import com.infomaniak.mail.utils.extensions.applySideAndBottomSystemInsets
 import com.infomaniak.mail.utils.extensions.applyStatusBarInsets
 import com.infomaniak.mail.utils.extensions.applyWindowInsetsListener
@@ -439,11 +440,10 @@ class NewMessageFragment : Fragment() {
         if (context.isNightModeEnabled()) addCss(context.getCustomDarkMode())
         addCss(context.getCustomStyle())
         addCss(context.getCustomEditorStyle())
-        addCss(context.getSignatureMarginStyle())
     }
 
     private fun removePlaceholder() {
-        binding.newMessagePlaceholder.visibility = View.GONE
+        binding.newMessagePlaceholder.isGone = true
     }
 
     private fun handleFocusChanges() {
@@ -479,8 +479,7 @@ class NewMessageFragment : Fragment() {
 
     private fun showKeyboardInCorrectView(isToFieldEmpty: Boolean) = with(recipientFieldsManager) {
         when (newMessageViewModel.draftMode()) {
-            DraftMode.REPLY,
-            DraftMode.REPLY_ALL -> focusBodyField()
+            DraftMode.REPLY, DraftMode.REPLY_ALL -> focusBodyField()
             DraftMode.FORWARD -> focusToField()
             DraftMode.NEW_MAIL -> if (isToFieldEmpty) focusToField() else focusBodyField()
         }
@@ -488,11 +487,13 @@ class NewMessageFragment : Fragment() {
 
     private fun configureUiWithDraftData(draft: Draft) = with(binding.editorWebView) {
         settings.setupNewMessageWebViewSettings()
+        val alwaysShowExternalContent = localSettings.externalContent == LocalSettings.ExternalContent.ALWAYS
         webViewClient = initWebViewClientAndBridge(
             attachments = draft.attachments,
             messageUid = "MESSAGE-" + draft.messageUid,
-            shouldLoadDistantResources = true,
-            navigateToNewMessageActivity = null
+            shouldLoadDistantResources = alwaysShowExternalContent || newMessageViewModel.shouldLoadDistantResources(),
+            navigateToNewMessageActivity = null,
+            onPageFinished = { binding.editorWebView.notifyPageHasLoaded() }
         )
     }
 
@@ -539,11 +540,13 @@ class NewMessageFragment : Fragment() {
 
     private fun onSignatureClicked(signature: Signature) {
         trackNewMessageEvent(MatomoName.SwitchIdentity)
+        newMessageViewModel.fromLiveData.value = UiFrom(signature)
+        addressListPopupWindow?.dismiss()
+    }
 
-        // Get the New Signature HTML
-        val newSignatureHtml = signature.content
+    private fun updateBodySignature(signature: Signature) {
         val wrappedNewSignature =
-            if (signature.isDummy) "" else signatureUtils.encapsulateSignatureContentWithInfomaniakClass(newSignatureHtml)
+            if (signature.isDummy) "" else signatureUtils.encapsulateSignatureContentWithInfomaniakClass(signature.content)
 
         val escapedSignature = wrappedNewSignature.escapeForJS()
 
@@ -553,10 +556,7 @@ class NewMessageFragment : Fragment() {
             MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME
         )
 
-        binding.editorWebView.evaluateJavascript(replaceSignatureScript) {
-            newMessageViewModel.fromLiveData.value = UiFrom(signature)
-            addressListPopupWindow?.dismiss()
-        }
+        binding.editorWebView.evaluateJavascript(replaceSignatureScript, null)
     }
 
     private fun updateSelectedSignatureInFromField(signature: Signature) {
@@ -586,8 +586,9 @@ class NewMessageFragment : Fragment() {
     }
 
     private fun observeFromData() = with(newMessageViewModel) {
-        fromLiveData.observe(viewLifecycleOwner) { (signature) ->
+        fromLiveData.observe(viewLifecycleOwner) { (signature, shouldUpdateBodySignature) ->
             updateSelectedSignatureInFromField(signature)
+            if (shouldUpdateBodySignature) updateBodySignature(signature)
             signatureAdapter.updateSelectedSignature(signature.id)
         }
     }
@@ -681,10 +682,13 @@ class NewMessageFragment : Fragment() {
         }
     }
 
-    private fun observeBodyLoader() {
-        newMessageViewModel.editorBodyInitializer.observe(viewLifecycleOwner) { body ->
+    private fun observeBodyLoader() = with(newMessageViewModel) {
+        editorBodyInitializer.observe(viewLifecycleOwner) { body ->
             editorContentManager.setContent(binding.editorWebView, body)
-            setupToggleQuotesButton()
+            if (bodyHasQuotes(body.content)) {
+                binding.editorWebView.addCssWithId(requireContext().getHideQuotesStyle(), "quote-visibility")
+                setupToggleQuotesButton()
+            }
         }
     }
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index 3139390682e..6ecfc3230e2 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -228,24 +228,19 @@ class NewMessageViewModel @Inject constructor(
     private val exitSignal: CompletableJob = Job()
 
     private val mailboxRefFlow = MutableSharedFlow<MailboxRef>(
-        replay = 1,
-        onBufferOverflow = BufferOverflow.DROP_OLDEST
+        replay = 1, onBufferOverflow = BufferOverflow.DROP_OLDEST
     )
 
-    private val _currentMailboxFlow: Flow<Mailbox> = mailboxRefFlow
-        .mapLatest {
-            val mailbox = mailboxController.getMailbox(it.userId, it.mailboxId)
-            if (mailbox == null) {
-                exitSignal.complete()
-                awaitCancellation()
-            }
-            mailbox
+    private val _currentMailboxFlow: Flow<Mailbox> = mailboxRefFlow.mapLatest {
+        val mailbox = mailboxController.getMailbox(it.userId, it.mailboxId)
+        if (mailbox == null) {
+            exitSignal.complete()
+            awaitCancellation()
         }
-        .shareIn(viewModelScope, SharingStarted.Lazily, replay = 1)
+        mailbox
+    }.shareIn(viewModelScope, SharingStarted.Lazily, replay = 1)
 
-    val currentUserIdFlow = _currentMailboxFlow
-        .map { it.userId }
-        .stateIn(viewModelScope, SharingStarted.Eagerly, null)
+    val currentUserIdFlow = _currentMailboxFlow.map { it.userId }.stateIn(viewModelScope, SharingStarted.Eagerly, null)
 
     suspend fun currentMailbox() = _currentMailboxFlow.first()
 
@@ -311,9 +306,7 @@ class NewMessageViewModel @Inject constructor(
 
         val draft: Draft? = runCatching {
 
-            signatures = currentMailbox().signatures
-                .also { signaturesCount = it.count() }
-                .toMutableList()
+            signatures = currentMailbox().signatures.also { signaturesCount = it.count() }.toMutableList()
                 .apply { add(index = 0, element = Signature.getDummySignature(appContext, email = currentMailbox().email)) }
 
             isNewMessage = !arrivedFromExistingDraft && draftLocalUuid == null
@@ -323,7 +316,6 @@ class NewMessageViewModel @Inject constructor(
         }.getOrNull()
 
         draft?.let {
-
             it.flagRecipientsAsAutomaticallyEntered()
 
             dismissNotification()
@@ -345,7 +337,7 @@ class NewMessageViewModel @Inject constructor(
                 draft.identityId = currentMailbox().getDefaultSignatureWithFallback().id.toString()
             }
             val contentType =
-                if (draft.mimeType == Utils.TEXT_PLAIN) BodyContentType.TEXT_PLAIN_WITH_HTML else BodyContentType.HTML_SANITIZED
+                if (draft.mimeType == Utils.TEXT_PLAIN) BodyContentType.TEXT_PLAIN_WITH_HTML else BodyContentType.HTML_UNSANITIZED
             initialBody = BodyContentPayload(draft.body, contentType)
             return draft
         }
@@ -361,16 +353,14 @@ class NewMessageViewModel @Inject constructor(
         when (draftMode) {
             DraftMode.NEW_MAIL -> recipient?.let { to = realmListOf(it) }
             DraftMode.REPLY, DraftMode.REPLY_ALL, DraftMode.FORWARD -> {
-                previousMessageUid
-                    ?.let { uid -> MessageController.getMessage(uid, realm) }
-                    ?.let { message ->
-                        val (fullMessage, hasFailedFetching) = DraftController.fetchHeavyDataIfNeeded(message, realm)
-                        previousMessage = fullMessage
+                previousMessageUid?.let { uid -> MessageController.getMessage(uid, realm) }?.let { message ->
+                    val (fullMessage, hasFailedFetching) = DraftController.fetchHeavyDataIfNeeded(message, realm)
+                    previousMessage = fullMessage
 
-                        if (hasFailedFetching) return@let
+                    if (hasFailedFetching) return@let
 
-                        setReplyForwardDraftValues(draft = this, fullMessage)
-                    }
+                    setReplyForwardDraftValues(draft = this, fullMessage)
+                }
             }
         }
 
@@ -383,6 +373,23 @@ class NewMessageViewModel @Inject constructor(
         }
 
         populateWithExternalMailDataIfNeeded(draft = this, intent)
+
+        val finalBodyContent = getFinalBodyContent()
+
+        initialBody = BodyContentPayload(finalBodyContent, BodyContentType.HTML_UNSANITIZED)
+    }
+
+    private fun getFinalBodyContent(): String {
+        var finalBodyContent = initialBody.content
+        if (!initialSignature.isNullOrEmpty()) {
+            finalBodyContent += initialSignature
+        }
+        if (!initialQuote.isNullOrEmpty()) {
+            _areQuotesVisible.value = true
+            finalBodyContent += initialQuote
+        }
+
+        return finalBodyContent
     }
 
     private suspend fun setReplyForwardDraftValues(draft: Draft, fullMessage: Message) {
@@ -429,7 +436,6 @@ class NewMessageViewModel @Inject constructor(
 
     private fun splitSignatureAndQuoteFromBody(draft: Draft) {
         val remoteBody = draft.body
-        Log.d("DRAFT BODY", remoteBody)
         if (remoteBody.isEmpty()) return
 
         val (body, signature, quote) = when (draft.mimeType) {
@@ -552,26 +558,11 @@ class NewMessageViewModel @Inject constructor(
 
         attachmentsLiveData.postValue(attachments)
 
-        var finalBodyContent = initialBody.content
-        val signatureHtml = draftSignature?.takeIf { !it.isDummy }?.content
-        val wrappedSignature = signatureHtml?.let { signatureUtils.encapsulateSignatureContentWithInfomaniakClass(it) }
-
-        if (isNewMessage && wrappedSignature != null) {
-            finalBodyContent += wrappedSignature
-        }
-
-        if (isNewMessage && !initialQuote.isNullOrEmpty()) {
-            _areQuotesVisible.emit(true)
-            finalBodyContent += MessageBodyUtils.encapsulateQuotesWithInfomaniakClass(initialQuote.toString())
-        }
-
-        val normalizedBody = normalizeHtml(finalBodyContent)
-        saveSnapshot(normalizedBody)
+        saveSnapshot(initialBody.content)
 
         editorBodyInitializer.postValue(
             BodyContentPayload(
-                content = normalizedBody,
-                type = BodyContentType.HTML_SANITIZED
+                content = initialBody.content, type = BodyContentType.HTML_UNSANITIZED
             )
         )
 
@@ -584,7 +575,11 @@ class NewMessageViewModel @Inject constructor(
     }
 
     fun bodyHasPlaceholder(bodyHtml: String): Boolean {
-        val body = JsoupParserUtil.jsoupParseBodyFragmentWithLog(bodyHtml).body()
+        val body = JsoupParserUtil.jsoupParseBodyFragmentWithLog(bodyHtml)
+        // Remove signature and quotes from body
+        // body.select(".${MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_CLASS_NAME}")?.remove()
+        // body.select(".${MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME}")?.remove()
+        // Check if there is any text left
         return !body.hasText()
     }
 
@@ -592,12 +587,6 @@ class NewMessageViewModel @Inject constructor(
         _areQuotesVisible.value = areVisible
     }
 
-    private fun normalizeHtml(html: String): String {
-        val doc = jsoupParseWithLog(html)
-        doc.outputSettings().prettyPrint(false)
-        return doc.body().html()
-    }
-
     private suspend fun getLocalOrRemoteDraft(localUuid: String?): Draft? {
 
         @Suppress("UNUSED_PARAMETER")
@@ -666,9 +655,11 @@ class NewMessageViewModel @Inject constructor(
         }
 
         if (hasExtra(Intent.EXTRA_STREAM)) {
-            (parcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri)
-                ?.let { importAttachments(currentAttachments = draft.attachments, uris = listOf(it)) }
-                ?.let(draft.attachments::addAll)
+            (parcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri)?.let {
+                importAttachments(
+                    currentAttachments = draft.attachments, uris = listOf(it)
+                )
+            }?.let(draft.attachments::addAll)
         }
     }
 
@@ -714,15 +705,11 @@ class NewMessageViewModel @Inject constructor(
         val mailToIntent = runCatching { MailTo.parse(uri!!) }.getOrNull()
         if (mailToIntent == null && intent?.hasExtra(Intent.EXTRA_EMAIL) != true) return
 
-        val splitTo = mailToIntent?.to?.splitToRecipientList()
-            ?: intent?.getRecipientsFromIntent(Intent.EXTRA_EMAIL)
-            ?: emptyList()
-        val splitCc = mailToIntent?.cc?.splitToRecipientList()
-            ?: intent?.getRecipientsFromIntent(Intent.EXTRA_CC)
-            ?: emptyList()
-        val splitBcc = mailToIntent?.bcc?.splitToRecipientList()
-            ?: intent?.getRecipientsFromIntent(Intent.EXTRA_BCC)
-            ?: emptyList()
+        val splitTo =
+            mailToIntent?.to?.splitToRecipientList() ?: intent?.getRecipientsFromIntent(Intent.EXTRA_EMAIL) ?: emptyList()
+        val splitCc = mailToIntent?.cc?.splitToRecipientList() ?: intent?.getRecipientsFromIntent(Intent.EXTRA_CC) ?: emptyList()
+        val splitBcc =
+            mailToIntent?.bcc?.splitToRecipientList() ?: intent?.getRecipientsFromIntent(Intent.EXTRA_BCC) ?: emptyList()
 
         draft.apply {
             to.addAll(splitTo)
@@ -1008,8 +995,7 @@ class NewMessageViewModel @Inject constructor(
 
         // Only if `!isFinishing`, because if we are finishing, well… We're out of here so we don't care about all of that.
         if (!isFinishing) {
-            val normalizedBody = normalizeHtml(body)
-            copyFromRealm().saveSnapshot(normalizedBody)
+            copyFromRealm().saveSnapshot(body)
             isNewMessage = false
         }
     }
@@ -1017,19 +1003,22 @@ class NewMessageViewModel @Inject constructor(
     private fun sanitizeBody(html: String): String {
         val doc = jsoupParseWithLog(html)
         // If the user deleted the quotes text, remove the quotes div so the button to show quotes doesn't show.
-        val quotes = JsoupParserUtil.jsoupParseBodyFragmentWithLog(html)
-            .getElementsByClass(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME)
-        val hasQuotes = quotes.isNotEmpty()
-        if (hasQuotes && !quotes.hasText()) {
+
+        if (bodyHasQuotes(html)) {
             doc.getElementsByClass(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME).forEach { it.remove() }
         }
 
-        // Don't save the draft or send the mail with quotes style display none.
-        if (hasQuotes) quotes.attr("style", "display: block")
-
         return doc.html()
     }
 
+    fun bodyHasQuotes(body: String): Boolean {
+        val replyQuotes = JsoupParserUtil.jsoupParseBodyFragmentWithLog(body)
+            .getElementsByClass(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME)
+        val forwardQuotes = JsoupParserUtil.jsoupParseBodyFragmentWithLog(body)
+            .getElementsByClass(MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME)
+        return replyQuotes.isNotEmpty() && replyQuotes.hasText() || forwardQuotes.isNotEmpty() && forwardQuotes.hasText()
+    }
+
     private fun Draft.updateDraftAttachmentsWithLiveData(uiAttachments: List<Attachment>, step: String) {
 
         /**
@@ -1039,9 +1028,8 @@ class NewMessageViewModel @Inject constructor(
          * - none got removed (their quantity is the same in UI and in Realm),
          * Then it means the Attachments list hasn't been edited by the user, so we have nothing to do here.
          */
-        val isForwardingUneditedAttachmentsList = draftMode == DraftMode.FORWARD &&
-                uiAttachments.all { it.attachmentUploadStatus == AttachmentUploadStatus.UPLOADED } &&
-                uiAttachments.count() == attachments.count()
+        val isForwardingUneditedAttachmentsList =
+            draftMode == DraftMode.FORWARD && uiAttachments.all { it.attachmentUploadStatus == AttachmentUploadStatus.UPLOADED } && uiAttachments.count() == attachments.count()
         if (isForwardingUneditedAttachmentsList) return
 
         val updatedAttachments = uiAttachments.map { uiAttachment ->
@@ -1133,8 +1121,7 @@ class NewMessageViewModel @Inject constructor(
     }
 
     enum class ImportationResult {
-        SUCCESS,
-        ATTACHMENTS_TOO_BIG,
+        SUCCESS, ATTACHMENTS_TOO_BIG,
     }
 
     data class MailboxRef(val userId: Int, val mailboxId: Int)
diff --git a/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt b/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
index f93026d27bd..6166b817862 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
@@ -230,7 +230,7 @@ class HtmlFormatter(private val html: String) {
             listOf(PRIMARY_COLOR_CODE to getAttributeColor(RAndroid.attr.colorPrimary))
         )
 
-        fun Context.getSignatureMarginStyle(): String = loadCss(R.raw.signature_margins)
+        fun Context.getHideQuotesStyle(): String = loadCss(R.raw.hide_quotes_style)
 
         fun Context.getPrintMailStyle(): String = loadCss(R.raw.print_email)
 
@@ -239,13 +239,18 @@ class HtmlFormatter(private val html: String) {
             listOf("MESSAGE_SELECTOR" to "#$KMAIL_MESSAGE_ID")
         )
 
-        fun Context.getToggleQuotesButtonVisibilityScript(): String = loadScript(
-            R.raw.show_quotes_script
-        )
+        private var cachedToggleQuotesScript: String? = null
+        fun Context.getToggleQuotesButtonVisibilityScript(): String {
+            return cachedToggleQuotesScript ?: loadScript(R.raw.show_quotes_script).also { cachedToggleQuotesScript = it }
+        }
 
-        fun Context.getReplaceSignatureScript(): String = loadScript(
-            R.raw.replace_signature_script
-        )
+        fun Context.getAddStyleWithIdScript(): String = loadScript(R.raw.add_style_with_id_script)
+
+        private var cachedReplaceSignatureScript: String? = null
+        fun Context.getReplaceSignatureScript(): String {
+            return cachedReplaceSignatureScript
+                ?: loadScript(R.raw.replace_signature_script).also { cachedReplaceSignatureScript = it }
+        }
 
         fun Context.getFixStyleScript(): String {
             return loadScript(R.raw.fix_email_style)
diff --git a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
index 6b5486f0fb2..77d756539cd 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
@@ -63,8 +63,9 @@ object MessageBodyUtils {
         "[name=\"quote\"]", // GMX
     )
 
-    fun encapsulateQuotesWithInfomaniakClass(quotes: String): String {
-        return """<div class="$INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME" spellcheck="false">$quotes<br></div>""".trimIndent()
+    fun addSpaceAtTheEndOfQuotes(quotes: String): String {
+        // This will help the user to delete the quotes completely
+        return """$quotes<br>"""
     }
 
     suspend fun splitContentAndQuote(body: Body): SplitBody {
diff --git a/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt
index 6041ff26004..96c1bbabb28 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt
@@ -17,31 +17,17 @@
  */
 package com.infomaniak.mail.utils
 
-import android.content.Context
-import com.infomaniak.mail.R
 import com.infomaniak.mail.utils.MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_CLASS_NAME
-import com.infomaniak.mail.utils.extensions.loadCss
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class SignatureUtils @Inject constructor(appContext: Context) {
-
-    private val signatureMargins by lazy { appContext.loadCss(R.raw.signature_margins) }
-
+class SignatureUtils @Inject constructor() {
     fun encapsulateSignatureContentWithInfomaniakClass(signatureContent: String): String {
-        val verticalMarginsCss = signatureMargins
-        val verticalMarginAttributes = extractAttributesFromMarginCss(verticalMarginsCss)
-        if (verticalMarginAttributes.isNullOrEmpty()) return signatureContent
-
         return """
-            <div class="$INFOMANIAK_SIGNATURE_HTML_CLASS_NAME" spellcheck="false" style="$verticalMarginAttributes">
+            <div class="$INFOMANIAK_SIGNATURE_HTML_CLASS_NAME" spellcheck="false">
             $signatureContent
             </div>
         """.trimIndent()
     }
-
-    private fun extractAttributesFromMarginCss(verticalMarginsCss: String): String? {
-        return Regex("""\{(.*)\}""").find(verticalMarginsCss)?.groupValues[1]
-    }
 }
diff --git a/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
index 0475f06e168..c20fda69021 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
@@ -126,7 +126,6 @@ class WebViewUtils(context: Context) {
         private fun WebSettings.setupCommonWebViewSettings() {
             @SuppressLint("SetJavaScriptEnabled")
             javaScriptEnabled = true
-            loadWithOverviewMode = true
             cacheMode = LOAD_CACHE_ELSE_NETWORK
         }
 
@@ -134,6 +133,7 @@ class WebViewUtils(context: Context) {
             setupCommonWebViewSettings()
 
             useWideViewPort = true
+            loadWithOverviewMode = true
             setSupportZoom(true)
             builtInZoomControls = true
             displayZoomControls = false
diff --git a/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt b/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt
index b70f87b6126..e46b63103c1 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt
@@ -79,6 +79,7 @@ import com.infomaniak.core.sentry.SentryLog
 import com.infomaniak.core.ui.showToast
 import com.infomaniak.dragdropswiperecyclerview.DragDropSwipeRecyclerView
 import com.infomaniak.lib.login.InfomaniakLogin
+import com.infomaniak.lib.richhtmleditor.RichHtmlEditorWebView
 import com.infomaniak.mail.BuildConfig
 import com.infomaniak.mail.R
 import com.infomaniak.mail.data.LocalSettings.ThreadDensity
@@ -110,6 +111,7 @@ import com.infomaniak.mail.ui.main.thread.ThreadFragment.HeaderState
 import com.infomaniak.mail.ui.newMessage.NewMessageViewModel.UiRecipients
 import com.infomaniak.mail.utils.AccountUtils
 import com.infomaniak.mail.utils.ApiErrorException
+import com.infomaniak.mail.utils.HtmlFormatter.Companion.getAddStyleWithIdScript
 import com.infomaniak.mail.utils.JsoupParserUtil.jsoupParseWithLog
 import com.infomaniak.mail.utils.UiUtils.animateColorChange
 import com.infomaniak.mail.utils.Utils
@@ -647,4 +649,14 @@ fun WebView.enableAlgorithmicDarkening(isEnabled: Boolean) {
     }
 }
 
+fun RichHtmlEditorWebView.addCssWithId(css: String, styleId: String) {
+    val escapedCss = css.replace("\\", "\\\\")
+        .replace("'", "\\'")
+        .replace("\n", "\\n")
+        .replace("\r", "")
+
+    val js = context.getAddStyleWithIdScript().format(styleId, escapedCss)
+    evaluateJavascript(js, null)
+}
+
 fun Data.getLongOrNull(key: String) = getLong(key, 0L).run { if (this == 0L) null else this }
diff --git a/app/src/main/res/layout/fragment_new_message.xml b/app/src/main/res/layout/fragment_new_message.xml
index c766a7cbb37..92131f84f97 100644
--- a/app/src/main/res/layout/fragment_new_message.xml
+++ b/app/src/main/res/layout/fragment_new_message.xml
@@ -323,11 +323,11 @@
                         style="@style/TextButton"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="10dp"
+                        android:layout_marginStart="@dimen/marginStandardMedium"
                         android:padding="@dimen/marginStandardVerySmall"
                         android:text="@string/messageShowQuotedText"
                         android:visibility="gone"
-                        app:layout_constraintStart_toStartOf="@id/postFields"
+                        app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/editorWebView"
                         tools:visibility="visible" />
 
diff --git a/app/src/main/res/raw/add_style_with_id_script.js b/app/src/main/res/raw/add_style_with_id_script.js
new file mode 100644
index 00000000000..094a1fc1914
--- /dev/null
+++ b/app/src/main/res/raw/add_style_with_id_script.js
@@ -0,0 +1,6 @@
+(function() {
+    var style = document.createElement('style');
+    style.id="%s";
+    style.textContent="%s";
+    document.head.appendChild(style);
+})()
diff --git a/app/src/main/res/raw/editor_style.css b/app/src/main/res/raw/editor_style.css
index 1341eaab723..212270a6280 100644
--- a/app/src/main/res/raw/editor_style.css
+++ b/app/src/main/res/raw/editor_style.css
@@ -6,14 +6,3 @@ body {
     margin-top: 0px;
     margin-bottom: 1rem;
 }
-
-p {
-    min-height: 1.4em;
-    line-height: 1.4em;
-    margin: 0;
-}
-
-.ik_mail_quote, .forwardContentMessage {
-    display: none;
-    overflow-x: auto !important;
-}
diff --git a/app/src/main/res/raw/hide_quotes_style.css b/app/src/main/res/raw/hide_quotes_style.css
new file mode 100644
index 00000000000..7537ab08f78
--- /dev/null
+++ b/app/src/main/res/raw/hide_quotes_style.css
@@ -0,0 +1,4 @@
+.ik_mail_quote, .forwardContentMessage {
+    display: none;
+    overflow-x: auto !important;
+}
diff --git a/app/src/main/res/raw/show_quotes_script.js b/app/src/main/res/raw/show_quotes_script.js
index b4b42db1a61..8d4350719ab 100644
--- a/app/src/main/res/raw/show_quotes_script.js
+++ b/app/src/main/res/raw/show_quotes_script.js
@@ -17,19 +17,19 @@
  */
 
 (function() {
-  const quoteElements = document.querySelectorAll('.ik_mail_quote, .forwardContentMessage');
-  quoteElements.forEach(el => {
-       el.style.display = 'block';
+    var style = document.getElementById("quote-visibility")
 
-       // Force reload images inside quotes
-       el.querySelectorAll('img').forEach(img => {
+    if (style) {
+        style.remove()
+
+        // Handle CID image reload when showing
+        document.querySelectorAll('.ik_mail_quote img, .forwardContentMessage img').forEach(img => {
          if (img.src.startsWith('cid:')) {
             // Store original CID, then reload
              const cid = img.src;
              img.src = '';
-
              setTimeout(() => img.src = cid, 0);
          }
        });
-  });
+    }
 })();
diff --git a/app/src/main/res/raw/signature_margins.css b/app/src/main/res/raw/signature_margins.css
deleted file mode 100644
index bb22fc91a9d..00000000000
--- a/app/src/main/res/raw/signature_margins.css
+++ /dev/null
@@ -1 +0,0 @@
-.editorUserSignature { margin-top: 1.5rem; margin-bottom: 1rem; } /* Only one selector in the whole file is supported. */

From 6610621e3e4c48dcde985933a1f877bc7ed418aa Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Tue, 10 Mar 2026 16:29:46 +0100
Subject: [PATCH 22/94] fix: Fix PR comments

---
 .../ReplyForwardFooterManager.kt              |   2 +-
 .../ui/main/thread/MessageWebViewClient.kt    |  25 ----
 .../mail/ui/newMessage/BodyContentPayload.kt  |   4 +-
 .../mail/ui/newMessage/NewMessageFragment.kt  |  43 ++++---
 .../mail/ui/newMessage/NewMessageViewModel.kt | 117 +++++++++++-------
 .../infomaniak/mail/utils/HtmlFormatter.kt    |  21 +---
 .../main/res/layout/fragment_new_message.xml  |   4 +-
 app/src/main/res/layout/item_message.xml      |   9 +-
 app/src/main/res/raw/editor_style.css         |   1 +
 app/src/main/res/raw/hide_quotes_style.css    |   1 -
 .../main/res/raw/replace_signature_script.js  |   8 +-
 app/src/main/res/raw/show_quotes_script.js    |   2 +-
 app/src/main/res/raw/style.css                |  14 ---
 app/src/main/res/values/styles.xml            |  10 ++
 14 files changed, 122 insertions(+), 139 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ReplyForwardFooterManager.kt b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ReplyForwardFooterManager.kt
index 41c80768768..9ec222568ef 100644
--- a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ReplyForwardFooterManager.kt
+++ b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ReplyForwardFooterManager.kt
@@ -130,7 +130,7 @@ class ReplyForwardFooterManager @Inject constructor(private val appContext: Cont
     }
 
     private fun assembleReplyHtmlFooter(messageReplyHeader: String, previousFullBody: String): String {
-        val replyRoot = """<div class="${MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME}" spellcheck="false" />"""
+        val replyRoot = """<div class="${MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME}"/>"""
         return parseAndWrapElementInNewDocument(replyRoot).apply {
             addAndEscapeTextLine("")
             addAndEscapeTextLine(messageReplyHeader, endWithBr = false)
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/MessageWebViewClient.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/MessageWebViewClient.kt
index 7976f15aa6e..1b2efeda752 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/MessageWebViewClient.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/MessageWebViewClient.kt
@@ -25,16 +25,12 @@ import android.webkit.WebResourceResponse
 import android.webkit.WebView
 import android.webkit.WebViewClient
 import com.infomaniak.core.ui.showToast
-import com.infomaniak.core.ui.view.toDp
 import com.infomaniak.mail.R
 import com.infomaniak.mail.data.api.ApiRepository
 import com.infomaniak.mail.data.models.Attachment
 import com.infomaniak.mail.utils.LocalStorageUtils
 import com.infomaniak.mail.utils.Utils
 import com.infomaniak.mail.utils.Utils.runCatchingRealm
-import com.infomaniak.mail.utils.WebViewVersionUtils.getWebViewVersionData
-import io.sentry.Sentry
-import io.sentry.SentryLevel
 import kotlinx.coroutines.runBlocking
 import java.io.ByteArrayInputStream
 
@@ -107,27 +103,6 @@ class MessageWebViewClient(
 
     override fun onPageFinished(webView: WebView, url: String?) {
         runCatchingRealm {
-            val widthInDp = webView.width.toDp(webView)
-            if (widthInDp <= 0) {
-                val versionData = getWebViewVersionData(context)
-
-                Sentry.captureMessage("Zero width webview detected onPageFinished which prevents message width's normalization") { scope ->
-                    scope.level = SentryLevel.WARNING
-                    scope.setExtra("width", webView.width.toString())
-                    scope.setExtra("measuredWidth", webView.measuredWidth.toString())
-                    scope.setExtra("height", webView.height.toString())
-                    scope.setExtra("measuredHeight", webView.measuredHeight.toString())
-                    scope.setTag(
-                        "webview version",
-                        "${versionData?.webViewPackageName}: ${versionData?.versionName} - ${versionData?.majorVersion}"
-                    )
-                    scope.setTag("visibility", webView.visibility.toString())
-                    scope.setTag("messageUid", messageUid)
-                    scope.setTag("shouldLoadDistantResources", shouldLoadDistantResources.toString())
-                }
-            }
-
-            webView.loadUrl("javascript:removeAllProperties(); normalizeMessageWidth($widthInDp, '$messageUid')")
             onPageFinished?.invoke()
         }
     }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt
index 6366a2e329e..618f5d2b14f 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt
@@ -27,8 +27,8 @@ data class BodyContentPayload(val content: String, val type: BodyContentType) {
         // Add some empty lines in the body so the body focus on these lines and not in the signature
         fun emptyBody() =
             BodyContentPayload(
-                content = "<br/><br/>",
-                type = BodyContentType.HTML_SANITIZED
+                content = "<br><br>",
+                type = BodyContentType.HTML_UNSANITIZED
             )
     }
 }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 66e7946c791..a38a9b62f91 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -58,6 +58,7 @@ import com.infomaniak.lib.richhtmleditor.StatusCommand.ITALIC
 import com.infomaniak.lib.richhtmleditor.StatusCommand.STRIKE_THROUGH
 import com.infomaniak.lib.richhtmleditor.StatusCommand.UNDERLINE
 import com.infomaniak.lib.richhtmleditor.StatusCommand.UNORDERED_LIST
+import com.infomaniak.lib.richhtmleditor.looselyEscapeAsStringLiteralForJs
 import com.infomaniak.mail.MatomoMail.MatomoName
 import com.infomaniak.mail.MatomoMail.trackAttachmentActionsEvent
 import com.infomaniak.mail.MatomoMail.trackNewMessageEvent
@@ -88,13 +89,12 @@ import com.infomaniak.mail.ui.newMessage.NewMessageViewModel.UiFrom
 import com.infomaniak.mail.ui.newMessage.encryption.EncryptionMessageManager
 import com.infomaniak.mail.ui.newMessage.encryption.EncryptionViewModel
 import com.infomaniak.mail.utils.AccountUtils
-import com.infomaniak.mail.utils.HtmlFormatter.Companion.escapeForJS
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getCustomDarkMode
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getCustomEditorStyle
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getCustomStyle
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getHideQuotesStyle
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getReplaceSignatureScript
-import com.infomaniak.mail.utils.HtmlFormatter.Companion.getToggleQuotesButtonVisibilityScript
+import com.infomaniak.mail.utils.HtmlFormatter.Companion.getShowQuotesScript
 import com.infomaniak.mail.utils.MessageBodyUtils
 import com.infomaniak.mail.utils.SentryDebug
 import com.infomaniak.mail.utils.SignatureUtils
@@ -135,6 +135,10 @@ class NewMessageFragment : Fragment() {
         // extras aren't yet initialized, so we don't use the `navArgs` here.
         requireActivity().intent?.extras?.let(NewMessageActivityArgs::fromBundle) ?: NewMessageActivityArgs()
     }
+    private val replaceSignatureScript by lazy { requireContext().getReplaceSignatureScript() }
+    private val showQuotesScript by lazy { requireContext().getShowQuotesScript() }
+    private val hideQuotesStyle by lazy { requireContext().getHideQuotesStyle() }
+
     private val newMessageFragmentArgs: NewMessageFragmentArgs by navArgs()
     private val newMessageViewModel: NewMessageViewModel by activityViewModels()
     private val aiViewModel: AiViewModel by activityViewModels()
@@ -219,6 +223,7 @@ class NewMessageFragment : Fragment() {
         observeImportAttachmentsResult()
         observeBodyLoader()
         observeShimmering()
+        observeQuotesVisibility()
 
         setupBackActionHandler()
 
@@ -463,7 +468,7 @@ class NewMessageFragment : Fragment() {
         if (initResult.value == null) {
             initDraftAndViewModel(intent = requireActivity().intent).observe(viewLifecycleOwner) { draft ->
                 if (draft != null) {
-                    val isBodyEmpty = newMessageViewModel.bodyHasPlaceholder(draft.body)
+                    val isBodyEmpty = newMessageViewModel.bodyIsEmpty(draft.body)
                     binding.newMessagePlaceholder.isVisible = isBodyEmpty
                     showKeyboardInCorrectView(isToFieldEmpty = draft.to.isEmpty())
                     binding.subjectTextField.setText(draft.subject)
@@ -493,16 +498,21 @@ class NewMessageFragment : Fragment() {
             messageUid = "MESSAGE-" + draft.messageUid,
             shouldLoadDistantResources = alwaysShowExternalContent || newMessageViewModel.shouldLoadDistantResources(),
             navigateToNewMessageActivity = null,
-            onPageFinished = { binding.editorWebView.notifyPageHasLoaded() }
+            onPageFinished = { notifyPageHasLoaded() }
         )
     }
 
-    private fun setupToggleQuotesButton() {
-        binding.quotesToggleButton.isVisible = newMessageViewModel.areQuotesVisible.value
-        binding.quotesToggleButton.setOnClickListener {
-            binding.editorWebView.evaluateJavascript(requireContext().getToggleQuotesButtonVisibilityScript()) {
-                binding.quotesToggleButton.isGone = true
-                newMessageViewModel.changeQuotesVisibility(areVisible = true)
+    private fun observeQuotesVisibility() = viewLifecycleOwner.lifecycleScope.launch {
+        // Don't show button if quotes are already visible
+        newMessageViewModel.isQuotesButtonVisible.collect { isVisible ->
+            binding.quotesToggleButton.isVisible = isVisible
+        }
+    }
+
+    private fun setupToggleQuotesButton() = with(binding) {
+        quotesToggleButton.setOnClickListener {
+            editorWebView.evaluateJavascript(showQuotesScript) {
+                newMessageViewModel.changeQuotesButtonVisibility(isVisible = false)
             }
         }
     }
@@ -545,12 +555,9 @@ class NewMessageFragment : Fragment() {
     }
 
     private fun updateBodySignature(signature: Signature) {
-        val wrappedNewSignature =
-            if (signature.isDummy) "" else signatureUtils.encapsulateSignatureContentWithInfomaniakClass(signature.content)
-
-        val escapedSignature = wrappedNewSignature.escapeForJS()
+        val escapedSignature = if (signature.isDummy) "" else looselyEscapeAsStringLiteralForJs(signature.content)
 
-        val replaceSignatureScript = requireContext().getReplaceSignatureScript().format(
+        val replaceSignatureScript = replaceSignatureScript.format(
             MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_CLASS_NAME,
             escapedSignature,
             MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME
@@ -685,10 +692,8 @@ class NewMessageFragment : Fragment() {
     private fun observeBodyLoader() = with(newMessageViewModel) {
         editorBodyInitializer.observe(viewLifecycleOwner) { body ->
             editorContentManager.setContent(binding.editorWebView, body)
-            if (bodyHasQuotes(body.content)) {
-                binding.editorWebView.addCssWithId(requireContext().getHideQuotesStyle(), "quote-visibility")
-                setupToggleQuotesButton()
-            }
+            binding.editorWebView.addCssWithId(hideQuotesStyle, "quote-visibility")
+            setupToggleQuotesButton()
         }
     }
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index 6ecfc3230e2..3fa61c67192 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -24,6 +24,7 @@ import android.content.ClipDescription
 import android.content.Intent
 import android.net.Uri
 import android.os.Parcelable
+import android.util.Log
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.net.MailTo
 import androidx.core.net.toUri
@@ -162,8 +163,6 @@ class NewMessageViewModel @Inject constructor(
 
     //region Initial data
     private var initialBody: BodyContentPayload = BodyContentPayload.emptyBody()
-    private var initialSignature: String? = null
-    private var initialQuote: String? = null
     //endregion
 
     //region UI data
@@ -221,8 +220,9 @@ class NewMessageViewModel @Inject constructor(
     private val _isShimmering = MutableStateFlow(true)
     val isShimmering: StateFlow<Boolean> = _isShimmering
 
-    private val _areQuotesVisible = MutableStateFlow(false)
-    val areQuotesVisible: StateFlow<Boolean> = _areQuotesVisible
+    private val _isQuotesButtonVisible = MutableStateFlow(false)
+    val isQuotesButtonVisible: StateFlow<Boolean> = _isQuotesButtonVisible
+    private var hasQuotes: Boolean = false
 
     //region Check mailbox existence
     private val exitSignal: CompletableJob = Job()
@@ -324,6 +324,9 @@ class NewMessageViewModel @Inject constructor(
             realm.write { DraftController.upsertDraftBlocking(it, realm = this) }
             it.initLiveData(signatures)
             _isShimmering.emit(false)
+            if (hasQuotes) {
+                changeQuotesButtonVisibility(isVisible = true)
+            }
             initResult.postValue(InitResult(it, signatures))
         }
 
@@ -336,8 +339,10 @@ class NewMessageViewModel @Inject constructor(
             if (draft.identityId.isNullOrBlank()) {
                 draft.identityId = currentMailbox().getDefaultSignatureWithFallback().id.toString()
             }
-            val contentType =
-                if (draft.mimeType == Utils.TEXT_PLAIN) BodyContentType.TEXT_PLAIN_WITH_HTML else BodyContentType.HTML_UNSANITIZED
+            val contentType = if (draft.mimeType == Utils.TEXT_PLAIN)
+                BodyContentType.TEXT_PLAIN_WITHOUT_HTML
+            else
+                BodyContentType.HTML_UNSANITIZED
             initialBody = BodyContentPayload(draft.body, contentType)
             return draft
         }
@@ -350,6 +355,7 @@ class NewMessageViewModel @Inject constructor(
         initLocalValues(mimeType = ClipDescription.MIMETYPE_TEXT_HTML)
         saveNavArgsToSavedState(localUuid)
 
+        var initialQuote: String? = null
         when (draftMode) {
             DraftMode.NEW_MAIL -> recipient?.let { to = realmListOf(it) }
             DraftMode.REPLY, DraftMode.REPLY_ALL, DraftMode.FORWARD -> {
@@ -359,11 +365,13 @@ class NewMessageViewModel @Inject constructor(
 
                     if (hasFailedFetching) return@let
 
-                    setReplyForwardDraftValues(draft = this, fullMessage)
+                    initializeReplyForwardDraftValues(draft = this, fullMessage)
+                    initialQuote = draftInitManager.createQuote(draftMode, fullMessage, attachments)
                 }
             }
         }
 
+        var initialSignature: String? = null
         with(draftInitManager) {
             val signature = chooseSignature(currentMailbox().email, signatures, draftMode, previousMessage)
             setSignatureIdentity(signature)
@@ -374,33 +382,34 @@ class NewMessageViewModel @Inject constructor(
 
         populateWithExternalMailDataIfNeeded(draft = this, intent)
 
-        val finalBodyContent = getFinalBodyContent()
+        val finalBodyContent = getFinalBodyContent(initialSignature, initialQuote)
 
         initialBody = BodyContentPayload(finalBodyContent, BodyContentType.HTML_UNSANITIZED)
     }
 
-    private fun getFinalBodyContent(): String {
+    private fun getFinalBodyContent(initialSignature: String?, initialQuote: String?): String {
         var finalBodyContent = initialBody.content
+
         if (!initialSignature.isNullOrEmpty()) {
             finalBodyContent += initialSignature
         }
         if (!initialQuote.isNullOrEmpty()) {
-            _areQuotesVisible.value = true
             finalBodyContent += initialQuote
+            hasQuotes = true
         }
 
         return finalBodyContent
     }
 
-    private suspend fun setReplyForwardDraftValues(draft: Draft, fullMessage: Message) {
+    /**
+     * Initializes some [draft] values related to reply, reply all and forward, when creating a new draft from scratch.
+     */
+    private suspend fun initializeReplyForwardDraftValues(draft: Draft, fullMessage: Message) {
 
         with(draftInitManager) {
             draft.setPreviousMessage(draftMode = draftMode, previousMessage = fullMessage)
         }
 
-        val quote = draftInitManager.createQuote(draftMode, fullMessage, draft.attachments)
-        if (quote != null) initialQuote = quote
-
         if (fullMessage.body == null) {
             SentryLog.e(TAG, "The message we're trying to reply to has an unexpected null body") { scope ->
                 scope.setExtra("Message resource", fullMessage.resource)
@@ -560,11 +569,7 @@ class NewMessageViewModel @Inject constructor(
 
         saveSnapshot(initialBody.content)
 
-        editorBodyInitializer.postValue(
-            BodyContentPayload(
-                content = initialBody.content, type = BodyContentType.HTML_UNSANITIZED
-            )
-        )
+        editorBodyInitializer.postValue(initialBody)
 
         if (cc.isNotEmpty() || bcc.isNotEmpty()) {
             otherRecipientsFieldsAreEmpty.postValue(false)
@@ -574,17 +579,44 @@ class NewMessageViewModel @Inject constructor(
         isEncryptionActivated.postValue(isEncrypted)
     }
 
-    fun bodyHasPlaceholder(bodyHtml: String): Boolean {
-        val body = JsoupParserUtil.jsoupParseBodyFragmentWithLog(bodyHtml)
-        // Remove signature and quotes from body
-        // body.select(".${MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_CLASS_NAME}")?.remove()
-        // body.select(".${MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME}")?.remove()
-        // Check if there is any text left
-        return !body.hasText()
+    fun bodyIsEmpty(bodyHtml: String): Boolean {
+        val body = getBodyWithoutSignatureAndQuotes(bodyHtml)
+        return body.isEmpty()
+    }
+
+    private fun getBodyWithoutSignatureAndQuotes(draftBody: String): String {
+
+        fun Document.split(divClassName: String, defaultValue: String): Pair<String, String?> {
+            return getElementsByClass(divClassName).firstOrNull()?.let {
+                it.remove()
+                val first = body().html()
+                val second = if (it.html().isBlank()) null else it.outerHtml()
+                first to second
+            } ?: (defaultValue to null)
+        }
+
+        fun String.lastIndexOfOrMax(string: String): Int {
+            val index = lastIndexOf(string)
+            return if (index == -1) Int.MAX_VALUE else index
+        }
+
+        val doc = jsoupParseWithLog(draftBody).also { it.outputSettings().prettyPrint(false) }
+
+        val (bodyWithQuote) = doc.split(MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_CLASS_NAME, draftBody)
+
+        val replyPosition = draftBody.lastIndexOfOrMax(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME)
+        val forwardPosition = draftBody.lastIndexOfOrMax(MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME)
+        val (body) = if (replyPosition < forwardPosition) {
+            doc.split(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME, bodyWithQuote)
+        } else {
+            doc.split(MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME, bodyWithQuote)
+        }
+
+        return body
     }
 
-    fun changeQuotesVisibility(areVisible: Boolean) {
-        _areQuotesVisible.value = areVisible
+    fun changeQuotesButtonVisibility(isVisible: Boolean) {
+        _isQuotesButtonVisible.value = isVisible
     }
 
     private suspend fun getLocalOrRemoteDraft(localUuid: String?): Draft? {
@@ -979,7 +1011,7 @@ class NewMessageViewModel @Inject constructor(
         )
 
         subject = subjectValue
-        body = sanitizeBody(uiBodyValue)
+        body = removeEmptyQuotes(uiBodyValue)
 
         /**
          * If we are opening for the 1st time an existing Draft created somewhere else
@@ -1000,23 +1032,23 @@ class NewMessageViewModel @Inject constructor(
         }
     }
 
-    private fun sanitizeBody(html: String): String {
+    private fun removeEmptyQuotes(html: String): String {
         val doc = jsoupParseWithLog(html)
-        // If the user deleted the quotes text, remove the quotes div so the button to show quotes doesn't show.
 
-        if (bodyHasQuotes(html)) {
+        // If the user deleted the quotes text, remove the quotes div so the button to show quotes doesn't show.
+        if (bodyHasEmptyQuotes(html)) {
             doc.getElementsByClass(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME).forEach { it.remove() }
         }
 
-        return doc.html()
+        return doc.body().html()
     }
 
-    fun bodyHasQuotes(body: String): Boolean {
+    private fun bodyHasEmptyQuotes(body: String): Boolean {
         val replyQuotes = JsoupParserUtil.jsoupParseBodyFragmentWithLog(body)
             .getElementsByClass(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME)
         val forwardQuotes = JsoupParserUtil.jsoupParseBodyFragmentWithLog(body)
             .getElementsByClass(MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME)
-        return replyQuotes.isNotEmpty() && replyQuotes.hasText() || forwardQuotes.isNotEmpty() && forwardQuotes.hasText()
+        return replyQuotes.isNotEmpty() && !replyQuotes.hasText() || forwardQuotes.isNotEmpty() && !forwardQuotes.hasText()
     }
 
     private fun Draft.updateDraftAttachmentsWithLiveData(uiAttachments: List<Attachment>, step: String) {
@@ -1058,15 +1090,12 @@ class NewMessageViewModel @Inject constructor(
 
     private fun isSnapshotTheSame(subjectValue: String?, uiBodyValue: String): Boolean {
         return snapshot?.let { draftSnapshot ->
-            draftSnapshot.identityId == fromLiveData.value?.signature?.id?.toString() &&
-                    draftSnapshot.to == toLiveData.valueOrEmpty().toSet() &&
-                    draftSnapshot.cc == ccLiveData.valueOrEmpty().toSet() &&
-                    draftSnapshot.bcc == bccLiveData.valueOrEmpty().toSet() &&
-                    draftSnapshot.subject == subjectValue &&
-                    sanitizeBody(draftSnapshot.uiBody) == sanitizeBody(uiBodyValue) &&
-                    draftSnapshot.isEncrypted == isEncryptionActivated.value &&
-                    draftSnapshot.encryptionPassword == encryptionPassword.value &&
-                    draftSnapshot.attachmentsLocalUuids == attachmentsLiveData.valueOrEmpty()
+            Log.d("DRAFT BODY", draftSnapshot.uiBody)
+            Log.d("BODY", uiBodyValue)
+            draftSnapshot.identityId == fromLiveData.value?.signature?.id?.toString() && draftSnapshot.to == toLiveData.valueOrEmpty()
+                .toSet() && draftSnapshot.cc == ccLiveData.valueOrEmpty()
+                .toSet() && draftSnapshot.bcc == bccLiveData.valueOrEmpty()
+                .toSet() && draftSnapshot.subject == subjectValue && draftSnapshot.uiBody == uiBodyValue && draftSnapshot.isEncrypted == isEncryptionActivated.value && draftSnapshot.encryptionPassword == encryptionPassword.value && draftSnapshot.attachmentsLocalUuids == attachmentsLiveData.valueOrEmpty()
                 .mapTo(mutableSetOf()) { it.localUuid }
         } ?: false
     }
diff --git a/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt b/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
index 6166b817862..cffe9dbd980 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
@@ -27,7 +27,6 @@ import com.infomaniak.mail.utils.UiUtils.PRIMARY_COLOR_CODE
 import com.infomaniak.mail.utils.extensions.getAttributeColor
 import com.infomaniak.mail.utils.extensions.loadCss
 import com.infomaniak.mail.utils.extensions.readRawResource
-import kotlinx.serialization.json.JsonPrimitive
 import org.jsoup.nodes.Element
 import org.jsoup.nodes.Node
 import org.jsoup.nodes.TextNode
@@ -211,11 +210,6 @@ class HtmlFormatter(private val html: String) {
             }
         }
 
-        fun String.escapeForJS(): String {
-            if (isNullOrEmpty()) return this
-            return JsonPrimitive(this).toString().removeSurrounding("\"")
-        }
-
         fun Context.getCustomDarkMode(): String = loadCss(R.raw.custom_dark_mode)
 
         fun Context.getImproveRenderingStyle(): String = loadCss(R.raw.improve_rendering)
@@ -230,8 +224,6 @@ class HtmlFormatter(private val html: String) {
             listOf(PRIMARY_COLOR_CODE to getAttributeColor(RAndroid.attr.colorPrimary))
         )
 
-        fun Context.getHideQuotesStyle(): String = loadCss(R.raw.hide_quotes_style)
-
         fun Context.getPrintMailStyle(): String = loadCss(R.raw.print_email)
 
         fun Context.getResizeScript(): String = loadScript(
@@ -239,18 +231,13 @@ class HtmlFormatter(private val html: String) {
             listOf("MESSAGE_SELECTOR" to "#$KMAIL_MESSAGE_ID")
         )
 
-        private var cachedToggleQuotesScript: String? = null
-        fun Context.getToggleQuotesButtonVisibilityScript(): String {
-            return cachedToggleQuotesScript ?: loadScript(R.raw.show_quotes_script).also { cachedToggleQuotesScript = it }
-        }
+        fun Context.getHideQuotesStyle(): String = loadCss(R.raw.hide_quotes_style)
+
+        fun Context.getShowQuotesScript(): String = loadScript(R.raw.show_quotes_script)
 
         fun Context.getAddStyleWithIdScript(): String = loadScript(R.raw.add_style_with_id_script)
 
-        private var cachedReplaceSignatureScript: String? = null
-        fun Context.getReplaceSignatureScript(): String {
-            return cachedReplaceSignatureScript
-                ?: loadScript(R.raw.replace_signature_script).also { cachedReplaceSignatureScript = it }
-        }
+        fun Context.getReplaceSignatureScript(): String = loadScript(R.raw.replace_signature_script)
 
         fun Context.getFixStyleScript(): String {
             return loadScript(R.raw.fix_email_style)
diff --git a/app/src/main/res/layout/fragment_new_message.xml b/app/src/main/res/layout/fragment_new_message.xml
index 92131f84f97..66208c23dc1 100644
--- a/app/src/main/res/layout/fragment_new_message.xml
+++ b/app/src/main/res/layout/fragment_new_message.xml
@@ -320,11 +320,9 @@
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/quotesToggleButton"
-                        style="@style/TextButton"
+                        style="@style/ToggleQuoteTextButton"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/marginStandardMedium"
-                        android:padding="@dimen/marginStandardVerySmall"
                         android:text="@string/messageShowQuotedText"
                         android:visibility="gone"
                         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml
index 75c0e6561bf..3a38aae238f 100644
--- a/app/src/main/res/layout/item_message.xml
+++ b/app/src/main/res/layout/item_message.xml
@@ -585,16 +585,9 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/quoteButton"
-                style="@style/TextButton"
+                style="@style/ToggleQuoteTextButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/marginStandardSmall"
-                android:insetLeft="@dimen/alternativeMargin"
-                android:insetTop="@dimen/marginStandardVerySmall"
-                android:insetRight="@dimen/alternativeMargin"
-                android:insetBottom="@dimen/marginStandardVerySmall"
-                android:minHeight="0dp"
-                android:padding="@dimen/marginStandardVerySmall"
                 android:text="@string/messageShowQuotedText" />
 
         </FrameLayout>
diff --git a/app/src/main/res/raw/editor_style.css b/app/src/main/res/raw/editor_style.css
index 212270a6280..0540cd3066a 100644
--- a/app/src/main/res/raw/editor_style.css
+++ b/app/src/main/res/raw/editor_style.css
@@ -5,4 +5,5 @@ html {
 body {
     margin-top: 0px;
     margin-bottom: 1rem;
+    overflow-x: auto !important;
 }
diff --git a/app/src/main/res/raw/hide_quotes_style.css b/app/src/main/res/raw/hide_quotes_style.css
index 7537ab08f78..80ee879896f 100644
--- a/app/src/main/res/raw/hide_quotes_style.css
+++ b/app/src/main/res/raw/hide_quotes_style.css
@@ -1,4 +1,3 @@
 .ik_mail_quote, .forwardContentMessage {
     display: none;
-    overflow-x: auto !important;
 }
diff --git a/app/src/main/res/raw/replace_signature_script.js b/app/src/main/res/raw/replace_signature_script.js
index c1da757990a..d93c141fe97 100644
--- a/app/src/main/res/raw/replace_signature_script.js
+++ b/app/src/main/res/raw/replace_signature_script.js
@@ -17,16 +17,16 @@
  */
 
 (function() {
-    var signatureElement = document.querySelector('.%s');
-    var newSigHtml = "%s";
+    const signatureElement = document.querySelector('.%s');
+    const newSigHtml = %s;
     if (signatureElement) {
         if (newSigHtml === "") {
             signatureElement.remove();
         } else {
-            signatureElement.outerHTML = newSigHtml;
+            signatureElement.innerHTML = newSigHtml;
         }
     } else if (newSigHtml !== "") {
-        var quotes = document.querySelector('.%s');
+        const quotes = document.querySelector('.%s');
         if (quotes) {
             quotes.insertAdjacentHTML('beforebegin', newSigHtml);
         } else {
diff --git a/app/src/main/res/raw/show_quotes_script.js b/app/src/main/res/raw/show_quotes_script.js
index 8d4350719ab..fffa5e5e3c6 100644
--- a/app/src/main/res/raw/show_quotes_script.js
+++ b/app/src/main/res/raw/show_quotes_script.js
@@ -17,7 +17,7 @@
  */
 
 (function() {
-    var style = document.getElementById("quote-visibility")
+    const style = document.getElementById("quote-visibility")
 
     if (style) {
         style.remove()
diff --git a/app/src/main/res/raw/style.css b/app/src/main/res/raw/style.css
index 70880b5bbf2..c7eb27097b6 100644
--- a/app/src/main/res/raw/style.css
+++ b/app/src/main/res/raw/style.css
@@ -11,20 +11,6 @@ body {
     min-width: auto !important;
 }
 
-#ik-quotes, #ik-quotes > * {
-    max-width: 100% !important;
-    box-sizing: border-box !important;
-}
-
-#ik-quotes table {
-    width: auto !important;
-    max-width: 100% !important;
-}
-
-img {
-    max-width: 100% !important;
-}
-
 blockquote {
     padding: 0.2em 1.2em !important;
     margin: 0 !important;
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f84fae5148c..63441a1d1b9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -146,6 +146,16 @@
         <item name="iconPadding">@dimen/marginStandardSmall</item>
     </style>
 
+    <style name="ToggleQuoteTextButton" parent="Widget.Material3.Button.TextButton">
+        <item name="android:layout_marginBottom">@dimen/marginStandardSmall</item>
+        <item name="android:insetLeft">@dimen/alternativeMargin</item>
+        <item name="android:insetTop">@dimen/marginStandardVerySmall</item>
+        <item name="android:insetRight">@dimen/alternativeMargin</item>
+        <item name="android:insetBottom">@dimen/marginStandardVerySmall</item>
+        <item name="android:minHeight">0dp</item>
+        <item name="android:padding">@dimen/marginStandardVerySmall</item>
+    </style>
+
     <style name="TextButtonPrimary" parent="Widget.Material3.Button">
         <item name="android:insetBottom">@dimen/textButtonPrimaryVerticalInset</item>
         <item name="android:insetTop">@dimen/textButtonPrimaryVerticalInset</item>

From 8002a56539cb2c09d01cb55fa312a2a5b86d2cf3 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Thu, 12 Mar 2026 15:00:35 +0100
Subject: [PATCH 23/94] fix: Horizontal scroll in messages

---
 app/src/main/res/raw/add_style_with_id_script.js | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 app/src/main/res/raw/add_style_with_id_script.js

diff --git a/app/src/main/res/raw/add_style_with_id_script.js b/app/src/main/res/raw/add_style_with_id_script.js
deleted file mode 100644
index 094a1fc1914..00000000000
--- a/app/src/main/res/raw/add_style_with_id_script.js
+++ /dev/null
@@ -1,6 +0,0 @@
-(function() {
-    var style = document.createElement('style');
-    style.id="%s";
-    style.textContent="%s";
-    document.head.appendChild(style);
-})()

From 416fc8f21fd2cf18a8c4115c6139efb120bec17f Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Thu, 12 Mar 2026 15:02:35 +0100
Subject: [PATCH 24/94] fix: Add horizontal scroll in messages

---
 .../mail/ui/newMessage/NewMessageFragment.kt         |  3 +--
 .../java/com/infomaniak/mail/utils/HtmlFormatter.kt  |  4 ++--
 .../java/com/infomaniak/mail/utils/WebViewUtils.kt   |  3 +++
 .../infomaniak/mail/utils/extensions/Extensions.kt   | 12 ------------
 app/src/main/res/raw/editor_style.css                |  6 ++++++
 app/src/main/res/raw/message_display_style.css       |  7 +++++++
 app/src/main/res/raw/show_quotes_script.js           |  2 +-
 settings.gradle.kts                                  |  1 +
 8 files changed, 21 insertions(+), 17 deletions(-)
 create mode 100644 app/src/main/res/raw/message_display_style.css

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index a38a9b62f91..9b17db68671 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -101,7 +101,6 @@ import com.infomaniak.mail.utils.SignatureUtils
 import com.infomaniak.mail.utils.WebViewUtils.Companion.setupNewMessageWebViewSettings
 import com.infomaniak.mail.utils.extensions.AttachmentExt
 import com.infomaniak.mail.utils.extensions.AttachmentExt.openAttachment
-import com.infomaniak.mail.utils.extensions.addCssWithId
 import com.infomaniak.mail.utils.extensions.applySideAndBottomSystemInsets
 import com.infomaniak.mail.utils.extensions.applyStatusBarInsets
 import com.infomaniak.mail.utils.extensions.applyWindowInsetsListener
@@ -445,6 +444,7 @@ class NewMessageFragment : Fragment() {
         if (context.isNightModeEnabled()) addCss(context.getCustomDarkMode())
         addCss(context.getCustomStyle())
         addCss(context.getCustomEditorStyle())
+        addCss(hideQuotesStyle, "quote-visibility")
     }
 
     private fun removePlaceholder() {
@@ -692,7 +692,6 @@ class NewMessageFragment : Fragment() {
     private fun observeBodyLoader() = with(newMessageViewModel) {
         editorBodyInitializer.observe(viewLifecycleOwner) { body ->
             editorContentManager.setContent(binding.editorWebView, body)
-            binding.editorWebView.addCssWithId(hideQuotesStyle, "quote-visibility")
             setupToggleQuotesButton()
         }
     }
diff --git a/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt b/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
index cffe9dbd980..e71be827882 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
@@ -214,6 +214,8 @@ class HtmlFormatter(private val html: String) {
 
         fun Context.getImproveRenderingStyle(): String = loadCss(R.raw.improve_rendering)
 
+        fun Context.getMessageDisplayStyle(): String = loadCss(R.raw.message_display_style)
+
         fun Context.getCustomStyle(): String = loadCss(
             R.raw.style,
             listOf(PRIMARY_COLOR_CODE to getAttributeColor(RAndroid.attr.colorPrimary)),
@@ -235,8 +237,6 @@ class HtmlFormatter(private val html: String) {
 
         fun Context.getShowQuotesScript(): String = loadScript(R.raw.show_quotes_script)
 
-        fun Context.getAddStyleWithIdScript(): String = loadScript(R.raw.add_style_with_id_script)
-
         fun Context.getReplaceSignatureScript(): String = loadScript(R.raw.replace_signature_script)
 
         fun Context.getFixStyleScript(): String {
diff --git a/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
index c20fda69021..99d62957b21 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
@@ -31,6 +31,7 @@ import com.infomaniak.mail.utils.HtmlFormatter.Companion.getCustomStyle
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getFixStyleScript
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getImproveRenderingStyle
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getJsBridgeScript
+import com.infomaniak.mail.utils.HtmlFormatter.Companion.getMessageDisplayStyle
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getPrintMailStyle
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getResizeScript
 import com.infomaniak.mail.utils.extensions.enableAlgorithmicDarkening
@@ -42,6 +43,7 @@ class WebViewUtils(context: Context) {
     private val customDarkMode by lazy { context.getCustomDarkMode() }
     private val improveRenderingStyle by lazy { context.getImproveRenderingStyle() }
     private val customStyle by lazy { context.getCustomStyle() }
+    private val messageDisplayStyle by lazy { context.getMessageDisplayStyle() }
     private val printMailStyle by lazy { context.getPrintMailStyle() }
 
     private val resizeScript by lazy { context.getResizeScript() }
@@ -70,6 +72,7 @@ class WebViewUtils(context: Context) {
         if (isDisplayedInDarkMode) registerCss(customDarkMode, DARK_BACKGROUND_STYLE_ID)
         registerCss(improveRenderingStyle)
         registerCss(customStyle)
+        registerCss(messageDisplayStyle)
         registerMetaViewPort()
         registerScript(resizeScript)
         registerScript(fixStyleScript)
diff --git a/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt b/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt
index e46b63103c1..b70f87b6126 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt
@@ -79,7 +79,6 @@ import com.infomaniak.core.sentry.SentryLog
 import com.infomaniak.core.ui.showToast
 import com.infomaniak.dragdropswiperecyclerview.DragDropSwipeRecyclerView
 import com.infomaniak.lib.login.InfomaniakLogin
-import com.infomaniak.lib.richhtmleditor.RichHtmlEditorWebView
 import com.infomaniak.mail.BuildConfig
 import com.infomaniak.mail.R
 import com.infomaniak.mail.data.LocalSettings.ThreadDensity
@@ -111,7 +110,6 @@ import com.infomaniak.mail.ui.main.thread.ThreadFragment.HeaderState
 import com.infomaniak.mail.ui.newMessage.NewMessageViewModel.UiRecipients
 import com.infomaniak.mail.utils.AccountUtils
 import com.infomaniak.mail.utils.ApiErrorException
-import com.infomaniak.mail.utils.HtmlFormatter.Companion.getAddStyleWithIdScript
 import com.infomaniak.mail.utils.JsoupParserUtil.jsoupParseWithLog
 import com.infomaniak.mail.utils.UiUtils.animateColorChange
 import com.infomaniak.mail.utils.Utils
@@ -649,14 +647,4 @@ fun WebView.enableAlgorithmicDarkening(isEnabled: Boolean) {
     }
 }
 
-fun RichHtmlEditorWebView.addCssWithId(css: String, styleId: String) {
-    val escapedCss = css.replace("\\", "\\\\")
-        .replace("'", "\\'")
-        .replace("\n", "\\n")
-        .replace("\r", "")
-
-    val js = context.getAddStyleWithIdScript().format(styleId, escapedCss)
-    evaluateJavascript(js, null)
-}
-
 fun Data.getLongOrNull(key: String) = getLong(key, 0L).run { if (this == 0L) null else this }
diff --git a/app/src/main/res/raw/editor_style.css b/app/src/main/res/raw/editor_style.css
index 0540cd3066a..91da9034c56 100644
--- a/app/src/main/res/raw/editor_style.css
+++ b/app/src/main/res/raw/editor_style.css
@@ -1,9 +1,15 @@
 html {
     caret-color: var(--kmail-primary-color);
+    /* overflow-x needs to be in both the html and the body for the whole email to scroll. */
+    overflow-x: auto !important;
 }
 
 body {
     margin-top: 0px;
     margin-bottom: 1rem;
+    /* overflow-x needs to be in both the html and the body for the whole email to scroll.
+    To have the spacing scroll with the mail it needs to be padding and not margin. */
     overflow-x: auto !important;
+    margin: 0;
+    padding: 16px;
 }
diff --git a/app/src/main/res/raw/message_display_style.css b/app/src/main/res/raw/message_display_style.css
new file mode 100644
index 00000000000..c02abd83dad
--- /dev/null
+++ b/app/src/main/res/raw/message_display_style.css
@@ -0,0 +1,7 @@
+/* The 16px must go in margin and not in padding,
+otherwise large elements will only have 16px on the left.
+You won't see the 16px on the right. */
+body {
+    margin: 16px;
+    padding: 0;
+}
diff --git a/app/src/main/res/raw/show_quotes_script.js b/app/src/main/res/raw/show_quotes_script.js
index fffa5e5e3c6..8d4350719ab 100644
--- a/app/src/main/res/raw/show_quotes_script.js
+++ b/app/src/main/res/raw/show_quotes_script.js
@@ -17,7 +17,7 @@
  */
 
 (function() {
-    const style = document.getElementById("quote-visibility")
+    var style = document.getElementById("quote-visibility")
 
     if (style) {
         style.remove()
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 86c0fcc2cff..7cbcbaaffe4 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -10,6 +10,7 @@ pluginManagement {
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
+        mavenLocal()
         google()
         mavenCentral()
         maven { url = uri("https://jitpack.io") }

From bc6da2decdc923f75be91bf8c85d590e0b7e43fd Mon Sep 17 00:00:00 2001
From: Gibran Chevalley <gibran.chevalley@infomaniak.com>
Date: Thu, 12 Mar 2026 14:43:05 +0100
Subject: [PATCH 25/94] feat: Add a EditorWebViewClient implementation as well

# Conflicts:
#	app/src/main/java/com/infomaniak/mail/ui/main/thread/MessageDisplayWebViewClient.kt
#	app/src/main/java/com/infomaniak/mail/ui/main/thread/MessageWebViewClient.kt
#	app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageWebViewClient.kt
#	app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt
---
 .../mail/ui/main/thread/ThreadAdapter.kt      | 11 +--
 .../webViewClient/EditorWebViewClient.kt      | 44 ++++++++++++
 .../MessageDisplayWebViewClient.kt            | 72 +++++++++++++++++++
 .../MessageWebViewClient.kt                   |  5 +-
 .../mail/ui/newMessage/NewMessageFragment.kt  |  5 +-
 .../com/infomaniak/mail/utils/HtmlUtils.kt    |  4 +-
 .../mail/utils/extensions/Extensions.kt       | 41 +++++++++--
 7 files changed, 165 insertions(+), 17 deletions(-)
 create mode 100644 app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/EditorWebViewClient.kt
 create mode 100644 app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageDisplayWebViewClient.kt
 rename app/src/main/java/com/infomaniak/mail/ui/main/thread/{ => webViewClient}/MessageWebViewClient.kt (97%)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadAdapter.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadAdapter.kt
index ae7976ae8e6..9aeb8efe68c 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadAdapter.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadAdapter.kt
@@ -65,6 +65,7 @@ import com.infomaniak.mail.databinding.ItemSuperCollapsedBlockBinding
 import com.infomaniak.mail.ui.main.thread.ThreadAdapter.ThreadAdapterViewHolder
 import com.infomaniak.mail.ui.main.thread.models.MessageUi
 import com.infomaniak.mail.ui.main.thread.models.MessageUi.UnsubscribeState
+import com.infomaniak.mail.ui.main.thread.webViewClient.MessageDisplayWebViewClient
 import com.infomaniak.mail.utils.AccountUtils
 import com.infomaniak.mail.utils.HtmlFormatter
 import com.infomaniak.mail.utils.MessageBodyUtils
@@ -86,7 +87,7 @@ import com.infomaniak.mail.utils.extensions.enableAlgorithmicDarkening
 import com.infomaniak.mail.utils.extensions.formatSubject
 import com.infomaniak.mail.utils.extensions.getAttributeColor
 import com.infomaniak.mail.utils.extensions.indexOfFirstOrNull
-import com.infomaniak.mail.utils.extensions.initWebViewClientAndBridge
+import com.infomaniak.mail.utils.extensions.initDisplayWebViewClientAndBridge
 import com.infomaniak.mail.utils.extensions.toDate
 import com.infomaniak.mail.utils.extensions.toggleChevron
 import io.sentry.Sentry
@@ -1122,8 +1123,8 @@ class ThreadAdapter(
             onAttachmentOptionsClicked = { onAttachmentOptionsClicked?.invoke(it) },
         )
 
-        private var _bodyWebViewClient: MessageWebViewClient? = null
-        private var _fullMessageWebViewClient: MessageWebViewClient? = null
+        private var _bodyWebViewClient: MessageDisplayWebViewClient? = null
+        private var _fullMessageWebViewClient: MessageDisplayWebViewClient? = null
         val bodyWebViewClient get() = _bodyWebViewClient!!
         val fullMessageWebViewClient get() = _fullMessageWebViewClient!!
 
@@ -1149,7 +1150,7 @@ class ThreadAdapter(
             }
 
             if (_bodyWebViewClient == null) {
-                _bodyWebViewClient = binding.bodyWebView.initWebViewClientAndBridge(
+                _bodyWebViewClient = binding.bodyWebView.initDisplayWebViewClientAndBridge(
                     attachments = message.attachments,
                     messageUid = message.uid,
                     shouldLoadDistantResources = shouldLoadDistantResources,
@@ -1158,7 +1159,7 @@ class ThreadAdapter(
                     onPageFinished = onPageFinished,
                     onWebViewFinishedLoading = onWebViewFinishedLoading,
                 )
-                _fullMessageWebViewClient = binding.fullMessageWebView.initWebViewClientAndBridge(
+                _fullMessageWebViewClient = binding.fullMessageWebView.initDisplayWebViewClientAndBridge(
                     attachments = message.attachments,
                     messageUid = message.uid,
                     shouldLoadDistantResources = shouldLoadDistantResources,
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/EditorWebViewClient.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/EditorWebViewClient.kt
new file mode 100644
index 00000000000..d6073140f39
--- /dev/null
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/EditorWebViewClient.kt
@@ -0,0 +1,44 @@
+/*
+ * Infomaniak Mail - Android
+ * Copyright (C) 2026 Infomaniak Network SA
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.infomaniak.mail.ui.main.thread.webViewClient
+
+import android.content.Context
+import android.net.Uri
+import android.webkit.WebView
+import com.infomaniak.mail.data.models.Attachment
+
+class EditorWebViewClient(
+    context: Context,
+    cidDictionary: MutableMap<String, Attachment>,
+    shouldLoadDistantResources: Boolean,
+    onBlockedResourcesDetected: (() -> Unit)? = null,
+    navigateToNewMessageActivity: ((Uri) -> Unit)?,
+    onPageFinished: (() -> Unit)? = null,
+) : MessageWebViewClient(
+    context,
+    cidDictionary,
+    shouldLoadDistantResources,
+    onBlockedResourcesDetected,
+    navigateToNewMessageActivity,
+    onPageFinished,
+) {
+    override fun onPageFinished(webView: WebView, url: String?) {
+        webView.evaluateJavascript("removeAllProperties()", null)
+        super.onPageFinished(webView, url)
+    }
+}
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageDisplayWebViewClient.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageDisplayWebViewClient.kt
new file mode 100644
index 00000000000..3b8d6d96a21
--- /dev/null
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageDisplayWebViewClient.kt
@@ -0,0 +1,72 @@
+/*
+ * Infomaniak Mail - Android
+ * Copyright (C) 2026 Infomaniak Network SA
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.infomaniak.mail.ui.main.thread.webViewClient
+
+import android.content.Context
+import android.net.Uri
+import android.webkit.WebView
+import com.infomaniak.core.ui.view.toDp
+import com.infomaniak.mail.data.models.Attachment
+import com.infomaniak.mail.utils.Utils.runCatchingRealm
+import com.infomaniak.mail.utils.WebViewVersionUtils
+import io.sentry.Sentry
+import io.sentry.SentryLevel
+
+class MessageDisplayWebViewClient(
+    private val context: Context,
+    cidDictionary: MutableMap<String, Attachment>,
+    private val messageUid: String,
+    private var shouldLoadDistantResources: Boolean,
+    onBlockedResourcesDetected: (() -> Unit)? = null,
+    navigateToNewMessageActivity: ((Uri) -> Unit)?,
+    onPageFinished: (() -> Unit)? = null,
+) : MessageWebViewClient(
+    context,
+    cidDictionary,
+    shouldLoadDistantResources,
+    onBlockedResourcesDetected,
+    navigateToNewMessageActivity,
+    onPageFinished,
+) {
+    override fun onPageFinished(webView: WebView, url: String?) {
+        runCatchingRealm {
+            val widthInDp = webView.width.toDp(webView)
+            if (widthInDp <= 0) {
+                val versionData = WebViewVersionUtils.getWebViewVersionData(context)
+
+                Sentry.captureMessage("Zero width webview detected onPageFinished which prevents message width's normalization") { scope ->
+                    scope.level = SentryLevel.WARNING
+                    scope.setExtra("width", webView.width.toString())
+                    scope.setExtra("measuredWidth", webView.measuredWidth.toString())
+                    scope.setExtra("height", webView.height.toString())
+                    scope.setExtra("measuredHeight", webView.measuredHeight.toString())
+                    scope.setTag(
+                        "webview version",
+                        "${versionData?.webViewPackageName}: ${versionData?.versionName} - ${versionData?.majorVersion}"
+                    )
+                    scope.setTag("visibility", webView.visibility.toString())
+                    scope.setTag("messageUid", messageUid)
+                    scope.setTag("shouldLoadDistantResources", shouldLoadDistantResources.toString())
+                }
+            }
+
+            webView.loadUrl("javascript:removeAllProperties(); normalizeMessageWidth($widthInDp, '$messageUid')")
+            super.onPageFinished(webView, url)
+        }
+    }
+}
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/MessageWebViewClient.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageWebViewClient.kt
similarity index 97%
rename from app/src/main/java/com/infomaniak/mail/ui/main/thread/MessageWebViewClient.kt
rename to app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageWebViewClient.kt
index 1b2efeda752..39138b435db 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/MessageWebViewClient.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageWebViewClient.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.infomaniak.mail.ui.main.thread
+package com.infomaniak.mail.ui.main.thread.webViewClient
 
 import android.content.Context
 import android.content.Intent
@@ -34,10 +34,9 @@ import com.infomaniak.mail.utils.Utils.runCatchingRealm
 import kotlinx.coroutines.runBlocking
 import java.io.ByteArrayInputStream
 
-class MessageWebViewClient(
+abstract class MessageWebViewClient(
     private val context: Context,
     private val cidDictionary: MutableMap<String, Attachment>,
-    private val messageUid: String,
     private var shouldLoadDistantResources: Boolean,
     private val onBlockedResourcesDetected: (() -> Unit)? = null,
     private val navigateToNewMessageActivity: ((Uri) -> Unit)?,
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 9b17db68671..f24f5740905 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -108,7 +108,7 @@ import com.infomaniak.mail.utils.extensions.bindAlertToViewLifecycle
 import com.infomaniak.mail.utils.extensions.changeToolbarColorOnScroll
 import com.infomaniak.mail.utils.extensions.enableAlgorithmicDarkening
 import com.infomaniak.mail.utils.extensions.ime
-import com.infomaniak.mail.utils.extensions.initWebViewClientAndBridge
+import com.infomaniak.mail.utils.extensions.initEditorWebviewClientAndBridge
 import com.infomaniak.mail.utils.extensions.navigateToDownloadProgressDialog
 import com.infomaniak.mail.utils.extensions.systemBars
 import com.infomaniak.mail.utils.extensions.valueOrEmpty
@@ -493,9 +493,8 @@ class NewMessageFragment : Fragment() {
     private fun configureUiWithDraftData(draft: Draft) = with(binding.editorWebView) {
         settings.setupNewMessageWebViewSettings()
         val alwaysShowExternalContent = localSettings.externalContent == LocalSettings.ExternalContent.ALWAYS
-        webViewClient = initWebViewClientAndBridge(
+        webViewClient = initEditorWebviewClientAndBridge(
             attachments = draft.attachments,
-            messageUid = "MESSAGE-" + draft.messageUid,
             shouldLoadDistantResources = alwaysShowExternalContent || newMessageViewModel.shouldLoadDistantResources(),
             navigateToNewMessageActivity = null,
             onPageFinished = { notifyPageHasLoaded() }
diff --git a/app/src/main/java/com/infomaniak/mail/utils/HtmlUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/HtmlUtils.kt
index ca6bd471f37..49e74c64cf3 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/HtmlUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/HtmlUtils.kt
@@ -1,6 +1,6 @@
 /*
  * Infomaniak Mail - Android
- * Copyright (C) 2024 Infomaniak Network SA
+ * Copyright (C) 2024-2026 Infomaniak Network SA
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 package com.infomaniak.mail.utils
 
 import com.infomaniak.mail.data.models.Attachment
-import com.infomaniak.mail.ui.main.thread.MessageWebViewClient
+import com.infomaniak.mail.ui.main.thread.webViewClient.MessageWebViewClient
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 
diff --git a/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt b/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt
index b70f87b6126..edefa9dae34 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt
@@ -101,12 +101,13 @@ import com.infomaniak.mail.ui.main.folder.DateSeparatorItemDecoration
 import com.infomaniak.mail.ui.main.folder.HeaderItemDecoration
 import com.infomaniak.mail.ui.main.folder.ThreadListAdapter
 import com.infomaniak.mail.ui.main.folder.ThreadListItem
-import com.infomaniak.mail.ui.main.thread.MessageWebViewClient
 import com.infomaniak.mail.ui.main.thread.RoundedBackgroundSpan
 import com.infomaniak.mail.ui.main.thread.SubjectFormatter.Companion.getTagsPaint
 import com.infomaniak.mail.ui.main.thread.SubjectFormatter.EllipsizeConfiguration
 import com.infomaniak.mail.ui.main.thread.SubjectFormatter.TagColor
 import com.infomaniak.mail.ui.main.thread.ThreadFragment.HeaderState
+import com.infomaniak.mail.ui.main.thread.webViewClient.EditorWebViewClient
+import com.infomaniak.mail.ui.main.thread.webViewClient.MessageDisplayWebViewClient
 import com.infomaniak.mail.ui.newMessage.NewMessageViewModel.UiRecipients
 import com.infomaniak.mail.utils.AccountUtils
 import com.infomaniak.mail.utils.ApiErrorException
@@ -258,7 +259,7 @@ fun LottieAnimationView.changePathColor(illuColors: IlluColors) {
     }
 }
 
-fun WebView.initWebViewClientAndBridge(
+fun WebView.initDisplayWebViewClientAndBridge(
     attachments: List<Attachment>,
     messageUid: String,
     shouldLoadDistantResources: Boolean,
@@ -266,7 +267,7 @@ fun WebView.initWebViewClientAndBridge(
     navigateToNewMessageActivity: ((Uri) -> Unit)?,
     onPageFinished: (() -> Unit)? = null,
     onWebViewFinishedLoading: (() -> Unit)? = null,
-): MessageWebViewClient {
+): MessageDisplayWebViewClient {
 
     WebViewUtils.initJavascriptBridge(onWebViewFinishedLoading)
     addJavascriptInterface(WebViewUtils.jsBridge, "kmail")
@@ -279,7 +280,7 @@ fun WebView.initWebViewClientAndBridge(
         }
     }
 
-    return MessageWebViewClient(
+    return MessageDisplayWebViewClient(
         context,
         cidDictionary,
         messageUid,
@@ -291,6 +292,38 @@ fun WebView.initWebViewClientAndBridge(
         webViewClient = it
     }
 }
+
+fun WebView.initEditorWebviewClientAndBridge(
+    attachments: List<Attachment>,
+    shouldLoadDistantResources: Boolean,
+    onBlockedResourcesDetected: (() -> Unit)? = null,
+    navigateToNewMessageActivity: ((Uri) -> Unit)?,
+    onPageFinished: (() -> Unit)? = null,
+    onWebViewFinishedLoading: (() -> Unit)? = null,
+): EditorWebViewClient {
+
+    WebViewUtils.initJavascriptBridge(onWebViewFinishedLoading)
+    addJavascriptInterface(WebViewUtils.jsBridge, "kmail")
+
+    val cidDictionary = mutableMapOf<String, Attachment>().apply {
+        attachments.forEach {
+            it.contentId?.let { cid ->
+                if (cid.isNotBlank()) this[cid] = it
+            }
+        }
+    }
+
+    return EditorWebViewClient(
+        context,
+        cidDictionary,
+        shouldLoadDistantResources,
+        onBlockedResourcesDetected,
+        navigateToNewMessageActivity,
+        onPageFinished,
+    ).also {
+        webViewClient = it
+    }
+}
 //endregion
 
 //region API

From 834b8365e2cbd430013bb386fc689a55887134c1 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Fri, 13 Mar 2026 13:24:08 +0100
Subject: [PATCH 26/94] fix: Fix snapshot and horizontal scroll in wide emails

---
 .../infomaniak/html/cleaner/BodyCleaner.kt    |  2 +-
 .../ui/newMessage/EditorContentManager.kt     | 20 +++++++++-----
 .../mail/ui/newMessage/NewMessageFragment.kt  | 19 ++++++++++----
 .../mail/ui/newMessage/NewMessageViewModel.kt | 26 +++++++++++--------
 app/src/main/res/raw/editor_style.css         |  1 +
 app/src/main/res/raw/style.css                |  2 --
 6 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/HtmlCleaner/src/main/java/com/infomaniak/html/cleaner/BodyCleaner.kt b/HtmlCleaner/src/main/java/com/infomaniak/html/cleaner/BodyCleaner.kt
index 32b4071465e..b94a55cc595 100644
--- a/HtmlCleaner/src/main/java/com/infomaniak/html/cleaner/BodyCleaner.kt
+++ b/HtmlCleaner/src/main/java/com/infomaniak/html/cleaner/BodyCleaner.kt
@@ -47,7 +47,7 @@ internal class BodyCleaner {
                 "var",
                 "wbr",
             )
-            .addAttributes(":all", "class", "dir", "id", "style")
+            .addAttributes(":all", "class", "dir", "id", "style", "spellcheck")
             .addAttributes("a", "name")
             // Allow all URI schemes in links.
             // Removing all protocols makes the list of protocols empty, which means allow all protocols.
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorContentManager.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorContentManager.kt
index e8d2ff09a93..362a59d178b 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorContentManager.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorContentManager.kt
@@ -28,8 +28,11 @@ import javax.inject.Inject
 @FragmentScoped
 class EditorContentManager @Inject constructor() {
 
-    fun setContent(editor: RichHtmlEditorWebView, bodyContentPayload: BodyContentPayload) = with(editor) {
-        when (bodyContentPayload.type) {
+    /**
+     * Returns the html that was processed and inserted inside the editor
+     * */
+    fun setContent(editor: RichHtmlEditorWebView, bodyContentPayload: BodyContentPayload): String = with(editor) {
+        return when (bodyContentPayload.type) {
             BodyContentType.HTML_SANITIZED -> setSanitizedHtml(bodyContentPayload.content)
             BodyContentType.HTML_UNSANITIZED -> setUnsanitizedHtml(bodyContentPayload.content)
             BodyContentType.TEXT_PLAIN_WITH_HTML -> setPlainTextAndInterpretHtml(bodyContentPayload.content)
@@ -37,16 +40,19 @@ class EditorContentManager @Inject constructor() {
         }
     }
 
-    private fun RichHtmlEditorWebView.setSanitizedHtml(html: String) = setHtml(html)
+    private fun RichHtmlEditorWebView.setSanitizedHtml(html: String): String {
+        setHtml(html)
+        return html
+    }
 
     private fun RichHtmlEditorWebView.setUnsanitizedHtml(html: String) = setSanitizedHtml(html.sanitize())
 
-    private fun RichHtmlEditorWebView.setPlainTextAndInterpretHtml(text: String) {
-        setSanitizedHtml(text.replaceNewLines().sanitize())
+    private fun RichHtmlEditorWebView.setPlainTextAndInterpretHtml(text: String): String {
+        return setSanitizedHtml(text.replaceNewLines().sanitize())
     }
 
-    private fun RichHtmlEditorWebView.setPlainTextAndEscapeHtml(text: String) {
-        setSanitizedHtml(text.escapeHtmlCharacters().replaceNewLines())
+    private fun RichHtmlEditorWebView.setPlainTextAndEscapeHtml(text: String): String {
+        return setSanitizedHtml(text.escapeHtmlCharacters().replaceNewLines())
     }
 
     private fun String.escapeHtmlCharacters(): String = Html.escapeHtml(this)
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index f24f5740905..9065fbfd930 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -349,10 +349,17 @@ class NewMessageFragment : Fragment() {
         )
     }
 
-    override fun onDestroyView() {
+    override fun onDestroyView() = with(newMessageViewModel) {
         // This block of code is needed in order to keep and reload the content of the editor across configuration changes.
         binding.editorWebView.exportHtml { html ->
-            newMessageViewModel.editorBodyInitializer.postValue(BodyContentPayload(html, BodyContentType.HTML_SANITIZED))
+            newMessageViewModel.editorBodyInitializer.postValue(
+                NewMessageViewModel.EditorBodyInitialization(
+                    BodyContentPayload(
+                        html,
+                        BodyContentType.HTML_SANITIZED
+                    )
+                )
+            )
         }
 
         addressListPopupWindow = null
@@ -444,7 +451,6 @@ class NewMessageFragment : Fragment() {
         if (context.isNightModeEnabled()) addCss(context.getCustomDarkMode())
         addCss(context.getCustomStyle())
         addCss(context.getCustomEditorStyle())
-        addCss(hideQuotesStyle, "quote-visibility")
     }
 
     private fun removePlaceholder() {
@@ -689,8 +695,11 @@ class NewMessageFragment : Fragment() {
     }
 
     private fun observeBodyLoader() = with(newMessageViewModel) {
-        editorBodyInitializer.observe(viewLifecycleOwner) { body ->
-            editorContentManager.setContent(binding.editorWebView, body)
+        editorBodyInitializer.observe(viewLifecycleOwner) { (body, isFirstInitialization) ->
+            val bodyContent = editorContentManager.setContent(binding.editorWebView, body)
+            if (isFirstInitialization) saveInitialSnapshot(bodyContent)
+            // We only hide the quotes if it is a new message. If it's a draft the quotes are always visible.
+            if (isNewMessage) binding.editorWebView.addCss(hideQuotesStyle, "quote-visibility")
             setupToggleQuotesButton()
         }
     }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index 3fa61c67192..e66e889917c 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -24,7 +24,6 @@ import android.content.ClipDescription
 import android.content.Intent
 import android.net.Uri
 import android.os.Parcelable
-import android.util.Log
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.net.MailTo
 import androidx.core.net.toUri
@@ -174,7 +173,9 @@ class NewMessageViewModel @Inject constructor(
     inline val allRecipients get() = toLiveData.valueOrEmpty() + ccLiveData.valueOrEmpty() + bccLiveData.valueOrEmpty()
     //endregion
 
-    val editorBodyInitializer = SingleLiveEvent<BodyContentPayload>()
+    data class EditorBodyInitialization(val bodyContentPayload: BodyContentPayload, val isFirstInitialization: Boolean = false)
+
+    val editorBodyInitializer = SingleLiveEvent<EditorBodyInitialization>()
 
     // 1. Navigating to AiPropositionFragment causes NewMessageFragment to export its body to `subjectAndBodyChannel`.
     // 2. Inserting the AI proposition navigates back to NewMessageFragment.
@@ -190,7 +191,7 @@ class NewMessageViewModel @Inject constructor(
     var isExternalBannerManuallyClosed = false
     var draftAction = DraftAction.SAVE
     var signaturesCount = 0
-    private var isNewMessage = false
+    var isNewMessage = false
 
     private var snapshot: DraftSnapshot? = null
 
@@ -549,6 +550,11 @@ class NewMessageViewModel @Inject constructor(
         )
     }
 
+    fun saveInitialSnapshot(body: String) = viewModelScope.launch(ioCoroutineContext) {
+        val draft: Draft? = getLatestLocalDraft(draftLocalUuid)
+        draft?.saveSnapshot(body)
+    }
+
     private suspend fun Draft.initLiveData(signatures: List<Signature>) {
         val draftSignature = signatures.singleOrNull { it.id == identityId?.toInt() }
 
@@ -569,7 +575,7 @@ class NewMessageViewModel @Inject constructor(
 
         saveSnapshot(initialBody.content)
 
-        editorBodyInitializer.postValue(initialBody)
+        editorBodyInitializer.postValue(EditorBodyInitialization(initialBody, isFirstInitialization = true))
 
         if (cc.isNotEmpty() || bcc.isNotEmpty()) {
             otherRecipientsFieldsAreEmpty.postValue(false)
@@ -581,7 +587,7 @@ class NewMessageViewModel @Inject constructor(
 
     fun bodyIsEmpty(bodyHtml: String): Boolean {
         val body = getBodyWithoutSignatureAndQuotes(bodyHtml)
-        return body.isEmpty()
+        return body.isBlank()
     }
 
     private fun getBodyWithoutSignatureAndQuotes(draftBody: String): String {
@@ -612,7 +618,7 @@ class NewMessageViewModel @Inject constructor(
             doc.split(MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME, bodyWithQuote)
         }
 
-        return body
+        return body.htmlToText()
     }
 
     fun changeQuotesButtonVisibility(isVisible: Boolean) {
@@ -1035,9 +1041,11 @@ class NewMessageViewModel @Inject constructor(
     private fun removeEmptyQuotes(html: String): String {
         val doc = jsoupParseWithLog(html)
 
-        // If the user deleted the quotes text, remove the quotes div so the button to show quotes doesn't show.
+        // If the user deleted the quotes text, remove the quotes div so user doesn't write in the quotes div
+        // (the text could get hidden later with the toggle button).
         if (bodyHasEmptyQuotes(html)) {
             doc.getElementsByClass(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME).forEach { it.remove() }
+            doc.getElementsByClass(MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME).forEach { it.remove() }
         }
 
         return doc.body().html()
@@ -1090,8 +1098,6 @@ class NewMessageViewModel @Inject constructor(
 
     private fun isSnapshotTheSame(subjectValue: String?, uiBodyValue: String): Boolean {
         return snapshot?.let { draftSnapshot ->
-            Log.d("DRAFT BODY", draftSnapshot.uiBody)
-            Log.d("BODY", uiBodyValue)
             draftSnapshot.identityId == fromLiveData.value?.signature?.id?.toString() && draftSnapshot.to == toLiveData.valueOrEmpty()
                 .toSet() && draftSnapshot.cc == ccLiveData.valueOrEmpty()
                 .toSet() && draftSnapshot.bcc == bccLiveData.valueOrEmpty()
@@ -1184,8 +1190,6 @@ class NewMessageViewModel @Inject constructor(
 
     private data class SubjectAndBodyData(val subject: String, val body: String, val expirationId: Int)
 
-    private data class BodyData(val body: BodyContentPayload, val signature: String?, val quote: String?)
-
     companion object {
         private val TAG = NewMessageViewModel::class.java.simpleName
 
diff --git a/app/src/main/res/raw/editor_style.css b/app/src/main/res/raw/editor_style.css
index 91da9034c56..63f75acee33 100644
--- a/app/src/main/res/raw/editor_style.css
+++ b/app/src/main/res/raw/editor_style.css
@@ -13,3 +13,4 @@ body {
     margin: 0;
     padding: 16px;
 }
+
diff --git a/app/src/main/res/raw/style.css b/app/src/main/res/raw/style.css
index c7eb27097b6..f39b5f4e64d 100644
--- a/app/src/main/res/raw/style.css
+++ b/app/src/main/res/raw/style.css
@@ -5,8 +5,6 @@ html {
 
 body {
     font-family: 'Helvetica';
-    margin: 16px;
-    padding: 0;
     width: auto !important;
     min-width: auto !important;
 }

From 9ee38c35b18c336f827cc03c1c9ae70c52b572fe Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Mon, 16 Mar 2026 13:55:35 +0100
Subject: [PATCH 27/94] fix: Change library version and fixes for configuration
 changes

---
 .../MessageDisplayWebViewClient.kt            |  5 +-
 .../mail/ui/newMessage/NewMessageFragment.kt  | 49 ++++++++++---------
 .../mail/ui/newMessage/NewMessageViewModel.kt | 32 ++++++++----
 app/src/main/res/layout/item_message.xml      |  2 +-
 app/src/main/res/raw/editor_style.css         |  5 +-
 .../main/res/raw/message_display_style.css    |  4 +-
 app/src/main/res/values/styles.xml            |  2 +-
 gradle/libs.versions.toml                     |  2 +-
 settings.gradle.kts                           |  1 -
 9 files changed, 57 insertions(+), 45 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageDisplayWebViewClient.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageDisplayWebViewClient.kt
index 3b8d6d96a21..49a19f280d3 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageDisplayWebViewClient.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageDisplayWebViewClient.kt
@@ -21,6 +21,7 @@ import android.content.Context
 import android.net.Uri
 import android.webkit.WebView
 import com.infomaniak.core.ui.view.toDp
+import com.infomaniak.lib.richhtmleditor.looselyEscapeAsStringLiteralForJs
 import com.infomaniak.mail.data.models.Attachment
 import com.infomaniak.mail.utils.Utils.runCatchingRealm
 import com.infomaniak.mail.utils.WebViewVersionUtils
@@ -64,8 +65,8 @@ class MessageDisplayWebViewClient(
                     scope.setTag("shouldLoadDistantResources", shouldLoadDistantResources.toString())
                 }
             }
-
-            webView.loadUrl("javascript:removeAllProperties(); normalizeMessageWidth($widthInDp, '$messageUid')")
+            val escapedMessageUid = looselyEscapeAsStringLiteralForJs(messageUid)
+            webView.loadUrl("javascript:removeAllProperties(); normalizeMessageWidth($widthInDp, '$escapedMessageUid')")
             super.onPageFinished(webView, url)
         }
     }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 9065fbfd930..43068786af7 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -222,6 +222,7 @@ class NewMessageFragment : Fragment() {
         observeImportAttachmentsResult()
         observeBodyLoader()
         observeShimmering()
+        observePlaceholderVisibility()
         observeQuotesVisibility()
 
         setupBackActionHandler()
@@ -349,15 +350,12 @@ class NewMessageFragment : Fragment() {
         )
     }
 
-    override fun onDestroyView() = with(newMessageViewModel) {
+    override fun onDestroyView() {
         // This block of code is needed in order to keep and reload the content of the editor across configuration changes.
         binding.editorWebView.exportHtml { html ->
             newMessageViewModel.editorBodyInitializer.postValue(
                 NewMessageViewModel.EditorBodyInitialization(
-                    BodyContentPayload(
-                        html,
-                        BodyContentType.HTML_SANITIZED
-                    )
+                    BodyContentPayload(html, BodyContentType.HTML_SANITIZED)
                 )
             )
         }
@@ -453,15 +451,11 @@ class NewMessageFragment : Fragment() {
         addCss(context.getCustomEditorStyle())
     }
 
-    private fun removePlaceholder() {
-        binding.newMessagePlaceholder.isGone = true
-    }
-
-    private fun handleFocusChanges() {
-        newMessageViewModel.isEditorWebViewFocusedLiveData.observe(viewLifecycleOwner) { isFocused ->
+    private fun handleFocusChanges() = with(newMessageViewModel) {
+        isEditorWebViewFocusedLiveData.observe(viewLifecycleOwner) { isFocused ->
             setToolbarEnabledStatus(isFocused)
-            if (isFocused && binding.newMessagePlaceholder.isVisible) {
-                removePlaceholder()
+            if (isFocused && isPlaceHolderVisible.value) {
+                changePlaceholderVisibility(isVisible = false)
             }
         }
     }
@@ -475,7 +469,7 @@ class NewMessageFragment : Fragment() {
             initDraftAndViewModel(intent = requireActivity().intent).observe(viewLifecycleOwner) { draft ->
                 if (draft != null) {
                     val isBodyEmpty = newMessageViewModel.bodyIsEmpty(draft.body)
-                    binding.newMessagePlaceholder.isVisible = isBodyEmpty
+                    changePlaceholderVisibility(isVisible = isBodyEmpty)
                     showKeyboardInCorrectView(isToFieldEmpty = draft.to.isEmpty())
                     binding.subjectTextField.setText(draft.subject)
                 } else {
@@ -490,7 +484,8 @@ class NewMessageFragment : Fragment() {
 
     private fun showKeyboardInCorrectView(isToFieldEmpty: Boolean) = with(recipientFieldsManager) {
         when (newMessageViewModel.draftMode()) {
-            DraftMode.REPLY, DraftMode.REPLY_ALL -> focusBodyField()
+            DraftMode.REPLY,
+            DraftMode.REPLY_ALL -> focusBodyField()
             DraftMode.FORWARD -> focusToField()
             DraftMode.NEW_MAIL -> if (isToFieldEmpty) focusToField() else focusBodyField()
         }
@@ -508,17 +503,26 @@ class NewMessageFragment : Fragment() {
     }
 
     private fun observeQuotesVisibility() = viewLifecycleOwner.lifecycleScope.launch {
-        // Don't show button if quotes are already visible
-        newMessageViewModel.isQuotesButtonVisible.collect { isVisible ->
-            binding.quotesToggleButton.isVisible = isVisible
+        newMessageViewModel.isQuotesButtonVisible.collect { isQuotesButtonVisible ->
+            binding.quotesToggleButton.isVisible = isQuotesButtonVisible
+            if (!isQuotesButtonVisible) {
+                // User toggle show quotes visibility
+                binding.editorWebView.evaluateJavascript(showQuotesScript, null)
+            } else {
+                binding.editorWebView.addCss(hideQuotesStyle, "quote-visibility")
+            }
+        }
+    }
+
+    private fun observePlaceholderVisibility() = viewLifecycleOwner.lifecycleScope.launch {
+        newMessageViewModel.isPlaceHolderVisible.collect { isPlaceholderVisible ->
+            binding.newMessagePlaceholder.isVisible = isPlaceholderVisible
         }
     }
 
     private fun setupToggleQuotesButton() = with(binding) {
         quotesToggleButton.setOnClickListener {
-            editorWebView.evaluateJavascript(showQuotesScript) {
-                newMessageViewModel.changeQuotesButtonVisibility(isVisible = false)
-            }
+            newMessageViewModel.changeQuotesButtonVisibility(isVisible = false)
         }
     }
 
@@ -698,8 +702,7 @@ class NewMessageFragment : Fragment() {
         editorBodyInitializer.observe(viewLifecycleOwner) { (body, isFirstInitialization) ->
             val bodyContent = editorContentManager.setContent(binding.editorWebView, body)
             if (isFirstInitialization) saveInitialSnapshot(bodyContent)
-            // We only hide the quotes if it is a new message. If it's a draft the quotes are always visible.
-            if (isNewMessage) binding.editorWebView.addCss(hideQuotesStyle, "quote-visibility")
+
             setupToggleQuotesButton()
         }
     }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index e66e889917c..a7b9e14016c 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -223,7 +223,9 @@ class NewMessageViewModel @Inject constructor(
 
     private val _isQuotesButtonVisible = MutableStateFlow(false)
     val isQuotesButtonVisible: StateFlow<Boolean> = _isQuotesButtonVisible
-    private var hasQuotes: Boolean = false
+
+    private val _isPlaceHolderVisible = MutableStateFlow(false)
+    val isPlaceHolderVisible: StateFlow<Boolean> = _isPlaceHolderVisible
 
     //region Check mailbox existence
     private val exitSignal: CompletableJob = Job()
@@ -232,6 +234,10 @@ class NewMessageViewModel @Inject constructor(
         replay = 1, onBufferOverflow = BufferOverflow.DROP_OLDEST
     )
 
+    fun changePlaceholderVisibility(isVisible: Boolean) {
+        _isPlaceHolderVisible.value = isVisible
+    }
+
     private val _currentMailboxFlow: Flow<Mailbox> = mailboxRefFlow.mapLatest {
         val mailbox = mailboxController.getMailbox(it.userId, it.mailboxId)
         if (mailbox == null) {
@@ -325,7 +331,7 @@ class NewMessageViewModel @Inject constructor(
             realm.write { DraftController.upsertDraftBlocking(it, realm = this) }
             it.initLiveData(signatures)
             _isShimmering.emit(false)
-            if (hasQuotes) {
+            if (bodyHasQuotes(draft.body) || bodyHasQuotes(initialBody.content)) {
                 changeQuotesButtonVisibility(isVisible = true)
             }
             initResult.postValue(InitResult(it, signatures))
@@ -384,7 +390,6 @@ class NewMessageViewModel @Inject constructor(
         populateWithExternalMailDataIfNeeded(draft = this, intent)
 
         val finalBodyContent = getFinalBodyContent(initialSignature, initialQuote)
-
         initialBody = BodyContentPayload(finalBodyContent, BodyContentType.HTML_UNSANITIZED)
     }
 
@@ -396,7 +401,6 @@ class NewMessageViewModel @Inject constructor(
         }
         if (!initialQuote.isNullOrEmpty()) {
             finalBodyContent += initialQuote
-            hasQuotes = true
         }
 
         return finalBodyContent
@@ -573,8 +577,6 @@ class NewMessageViewModel @Inject constructor(
 
         attachmentsLiveData.postValue(attachments)
 
-        saveSnapshot(initialBody.content)
-
         editorBodyInitializer.postValue(EditorBodyInitialization(initialBody, isFirstInitialization = true))
 
         if (cc.isNotEmpty() || bcc.isNotEmpty()) {
@@ -585,6 +587,11 @@ class NewMessageViewModel @Inject constructor(
         isEncryptionActivated.postValue(isEncrypted)
     }
 
+    private fun bodyHasQuotes(body: String): Boolean {
+        return body.contains(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME) ||
+                body.contains(MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME)
+    }
+
     fun bodyIsEmpty(bodyHtml: String): Boolean {
         val body = getBodyWithoutSignatureAndQuotes(bodyHtml)
         return body.isBlank()
@@ -1098,10 +1105,15 @@ class NewMessageViewModel @Inject constructor(
 
     private fun isSnapshotTheSame(subjectValue: String?, uiBodyValue: String): Boolean {
         return snapshot?.let { draftSnapshot ->
-            draftSnapshot.identityId == fromLiveData.value?.signature?.id?.toString() && draftSnapshot.to == toLiveData.valueOrEmpty()
-                .toSet() && draftSnapshot.cc == ccLiveData.valueOrEmpty()
-                .toSet() && draftSnapshot.bcc == bccLiveData.valueOrEmpty()
-                .toSet() && draftSnapshot.subject == subjectValue && draftSnapshot.uiBody == uiBodyValue && draftSnapshot.isEncrypted == isEncryptionActivated.value && draftSnapshot.encryptionPassword == encryptionPassword.value && draftSnapshot.attachmentsLocalUuids == attachmentsLiveData.valueOrEmpty()
+            draftSnapshot.identityId == fromLiveData.value?.signature?.id?.toString() &&
+                    draftSnapshot.to == toLiveData.valueOrEmpty().toSet() &&
+                    draftSnapshot.cc == ccLiveData.valueOrEmpty().toSet() &&
+                    draftSnapshot.bcc == bccLiveData.valueOrEmpty().toSet() &&
+                    draftSnapshot.subject == subjectValue &&
+                    draftSnapshot.uiBody == uiBodyValue &&
+                    draftSnapshot.isEncrypted == isEncryptionActivated.value &&
+                    draftSnapshot.encryptionPassword == encryptionPassword.value &&
+                    draftSnapshot.attachmentsLocalUuids == attachmentsLiveData.valueOrEmpty()
                 .mapTo(mutableSetOf()) { it.localUuid }
         } ?: false
     }
diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml
index 3a38aae238f..fe592eed8e3 100644
--- a/app/src/main/res/layout/item_message.xml
+++ b/app/src/main/res/layout/item_message.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--
   ~ Infomaniak Mail - Android
-  ~ Copyright (C) 2022-2025 Infomaniak Network SA
+  ~ Copyright (C) 2022-2026 Infomaniak Network SA
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/res/raw/editor_style.css b/app/src/main/res/raw/editor_style.css
index 63f75acee33..24581eec5b9 100644
--- a/app/src/main/res/raw/editor_style.css
+++ b/app/src/main/res/raw/editor_style.css
@@ -7,10 +7,9 @@ html {
 body {
     margin-top: 0px;
     margin-bottom: 1rem;
-    /* overflow-x needs to be in both the html and the body for the whole email to scroll.
-    To have the spacing scroll with the mail it needs to be padding and not margin. */
+    /* overflow-x needs to be in both the html and the body for the whole email to scroll. */
+    /* To have the spacing scroll with the mail it needs to be padding and not margin. */
     overflow-x: auto !important;
     margin: 0;
     padding: 16px;
 }
-
diff --git a/app/src/main/res/raw/message_display_style.css b/app/src/main/res/raw/message_display_style.css
index c02abd83dad..fb699e66496 100644
--- a/app/src/main/res/raw/message_display_style.css
+++ b/app/src/main/res/raw/message_display_style.css
@@ -1,6 +1,4 @@
-/* The 16px must go in margin and not in padding,
-otherwise large elements will only have 16px on the left.
-You won't see the 16px on the right. */
+/* The 16px must go in margin and not in padding, otherwise large elements will only have 16px on the left. You won't see the 16px on the right. */
 body {
     margin: 16px;
     padding: 0;
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 63441a1d1b9..0d064304101 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--
   ~ Infomaniak Mail - Android
-  ~ Copyright (C) 2022-2025 Infomaniak Network SA
+  ~ Copyright (C) 2022-2026 Infomaniak Network SA
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 389b80cc7ff..bc52d6065da 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -20,7 +20,7 @@ mockk = "1.14.6"
 orchestrator = "1.6.1"
 playServices = "18.9.0"
 realmKotlin = "3.2.8-2"
-richHtmlEditor = "0.2.0"
+richHtmlEditor = "1.0.0"
 uiautomator = "2.3.0"
 uiTestJunit4 = "1.10.0"
 webkit = "1.14.0"
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 7cbcbaaffe4..86c0fcc2cff 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -10,7 +10,6 @@ pluginManagement {
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
-        mavenLocal()
         google()
         mavenCentral()
         maven { url = uri("https://jitpack.io") }

From a1728b7c355aeed1347491e3e1f1f1c4048d981e Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Mon, 16 Mar 2026 14:18:48 +0100
Subject: [PATCH 28/94] refactor: Changes for PR

---
 .../mail/ui/newMessage/NewMessageFragment.kt  |  2 +-
 .../mail/ui/newMessage/NewMessageViewModel.kt | 41 +++++++++++--------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 43068786af7..ad394fd1f03 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -506,7 +506,7 @@ class NewMessageFragment : Fragment() {
         newMessageViewModel.isQuotesButtonVisible.collect { isQuotesButtonVisible ->
             binding.quotesToggleButton.isVisible = isQuotesButtonVisible
             if (!isQuotesButtonVisible) {
-                // User toggle show quotes visibility
+                // User toggled show quotes visibility
                 binding.editorWebView.evaluateJavascript(showQuotesScript, null)
             } else {
                 binding.editorWebView.addCss(hideQuotesStyle, "quote-visibility")
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index a7b9e14016c..03b6ee3137c 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -366,15 +366,17 @@ class NewMessageViewModel @Inject constructor(
         when (draftMode) {
             DraftMode.NEW_MAIL -> recipient?.let { to = realmListOf(it) }
             DraftMode.REPLY, DraftMode.REPLY_ALL, DraftMode.FORWARD -> {
-                previousMessageUid?.let { uid -> MessageController.getMessage(uid, realm) }?.let { message ->
-                    val (fullMessage, hasFailedFetching) = DraftController.fetchHeavyDataIfNeeded(message, realm)
-                    previousMessage = fullMessage
+                previousMessageUid
+                    ?.let { uid -> MessageController.getMessage(uid, realm) }
+                    ?.let { message ->
+                        val (fullMessage, hasFailedFetching) = DraftController.fetchHeavyDataIfNeeded(message, realm)
+                        previousMessage = fullMessage
 
-                    if (hasFailedFetching) return@let
+                        if (hasFailedFetching) return@let
 
-                    initializeReplyForwardDraftValues(draft = this, fullMessage)
-                    initialQuote = draftInitManager.createQuote(draftMode, fullMessage, attachments)
-                }
+                        initializeReplyForwardDraftValues(draft = this, fullMessage)
+                        initialQuote = draftInitManager.createQuote(draftMode, fullMessage, attachments)
+                    }
             }
         }
 
@@ -750,11 +752,15 @@ class NewMessageViewModel @Inject constructor(
         val mailToIntent = runCatching { MailTo.parse(uri!!) }.getOrNull()
         if (mailToIntent == null && intent?.hasExtra(Intent.EXTRA_EMAIL) != true) return
 
-        val splitTo =
-            mailToIntent?.to?.splitToRecipientList() ?: intent?.getRecipientsFromIntent(Intent.EXTRA_EMAIL) ?: emptyList()
-        val splitCc = mailToIntent?.cc?.splitToRecipientList() ?: intent?.getRecipientsFromIntent(Intent.EXTRA_CC) ?: emptyList()
-        val splitBcc =
-            mailToIntent?.bcc?.splitToRecipientList() ?: intent?.getRecipientsFromIntent(Intent.EXTRA_BCC) ?: emptyList()
+        val splitTo = mailToIntent?.to?.splitToRecipientList()
+            ?: intent?.getRecipientsFromIntent(Intent.EXTRA_EMAIL)
+            ?: emptyList()
+        val splitCc = mailToIntent?.cc?.splitToRecipientList()
+            ?: intent?.getRecipientsFromIntent(Intent.EXTRA_CC)
+            ?: emptyList()
+        val splitBcc = mailToIntent?.bcc?.splitToRecipientList()
+            ?: intent?.getRecipientsFromIntent(Intent.EXTRA_BCC)
+            ?: emptyList()
 
         draft.apply {
             to.addAll(splitTo)
@@ -1053,9 +1059,10 @@ class NewMessageViewModel @Inject constructor(
         if (bodyHasEmptyQuotes(html)) {
             doc.getElementsByClass(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME).forEach { it.remove() }
             doc.getElementsByClass(MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME).forEach { it.remove() }
+            return doc.html()
         }
 
-        return doc.body().html()
+        return html
     }
 
     private fun bodyHasEmptyQuotes(body: String): Boolean {
@@ -1075,8 +1082,9 @@ class NewMessageViewModel @Inject constructor(
          * - none got removed (their quantity is the same in UI and in Realm),
          * Then it means the Attachments list hasn't been edited by the user, so we have nothing to do here.
          */
-        val isForwardingUneditedAttachmentsList =
-            draftMode == DraftMode.FORWARD && uiAttachments.all { it.attachmentUploadStatus == AttachmentUploadStatus.UPLOADED } && uiAttachments.count() == attachments.count()
+        val isForwardingUneditedAttachmentsList = draftMode == DraftMode.FORWARD &&
+                uiAttachments.all { it.attachmentUploadStatus == AttachmentUploadStatus.UPLOADED } &&
+                uiAttachments.count() == attachments.count()
         if (isForwardingUneditedAttachmentsList) return
 
         val updatedAttachments = uiAttachments.map { uiAttachment ->
@@ -1168,7 +1176,8 @@ class NewMessageViewModel @Inject constructor(
     }
 
     enum class ImportationResult {
-        SUCCESS, ATTACHMENTS_TOO_BIG,
+        SUCCESS,
+        ATTACHMENTS_TOO_BIG,
     }
 
     data class MailboxRef(val userId: Int, val mailboxId: Int)

From 59d42f5567c78a062dd1a923b2bbd1836cf35d55 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Mon, 16 Mar 2026 14:33:40 +0100
Subject: [PATCH 29/94] fix: Make sure webview is ready before evaluating js

---
 .../mail/ui/newMessage/NewMessageFragment.kt        | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index ad394fd1f03..cc2076957d6 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -505,11 +505,14 @@ class NewMessageFragment : Fragment() {
     private fun observeQuotesVisibility() = viewLifecycleOwner.lifecycleScope.launch {
         newMessageViewModel.isQuotesButtonVisible.collect { isQuotesButtonVisible ->
             binding.quotesToggleButton.isVisible = isQuotesButtonVisible
-            if (!isQuotesButtonVisible) {
-                // User toggled show quotes visibility
-                binding.editorWebView.evaluateJavascript(showQuotesScript, null)
-            } else {
-                binding.editorWebView.addCss(hideQuotesStyle, "quote-visibility")
+            // If it isn't shimmering, the webview is ready to evaluate js.
+            if (!newMessageViewModel.isShimmering.value) {
+                if (!isQuotesButtonVisible) {
+                    // User toggled show quotes visibility
+                    binding.editorWebView.evaluateJavascript(showQuotesScript, null)
+                } else {
+                    binding.editorWebView.addCss(hideQuotesStyle, "quote-visibility")
+                }
             }
         }
     }

From 6f90567e27b4d0194c5d9ceb0f0c01f8f04d055d Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Mon, 16 Mar 2026 15:25:23 +0100
Subject: [PATCH 30/94] fix: Remove unnecesary margins in css and add margin to
 placeholder

---
 app/src/main/res/layout/fragment_new_message.xml | 1 +
 app/src/main/res/raw/editor_style.css            | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/fragment_new_message.xml b/app/src/main/res/layout/fragment_new_message.xml
index 66208c23dc1..81738f2a4d8 100644
--- a/app/src/main/res/layout/fragment_new_message.xml
+++ b/app/src/main/res/layout/fragment_new_message.xml
@@ -308,6 +308,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:layout_marginStart="@dimen/marginStandardMedium"
+                        android:layout_marginTop="@dimen/marginStandardMedium"
                         android:paddingBottom="@dimen/marginStandardMedium"
                         android:text="@string/newMessagePlaceholderTitle"
                         android:textColor="@color/tertiaryTextColor"
diff --git a/app/src/main/res/raw/editor_style.css b/app/src/main/res/raw/editor_style.css
index 24581eec5b9..cb58fe15f1d 100644
--- a/app/src/main/res/raw/editor_style.css
+++ b/app/src/main/res/raw/editor_style.css
@@ -5,8 +5,6 @@ html {
 }
 
 body {
-    margin-top: 0px;
-    margin-bottom: 1rem;
     /* overflow-x needs to be in both the html and the body for the whole email to scroll. */
     /* To have the spacing scroll with the mail it needs to be padding and not margin. */
     overflow-x: auto !important;

From 2fdb8e819622ccb79e610d713979e78b10f9a771 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Mon, 16 Mar 2026 16:03:00 +0100
Subject: [PATCH 31/94] refactor: Add shimmering comment and check quotes
 visibility after init

---
 .../com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt     | 2 +-
 .../com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index cc2076957d6..23139854e88 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -505,7 +505,7 @@ class NewMessageFragment : Fragment() {
     private fun observeQuotesVisibility() = viewLifecycleOwner.lifecycleScope.launch {
         newMessageViewModel.isQuotesButtonVisible.collect { isQuotesButtonVisible ->
             binding.quotesToggleButton.isVisible = isQuotesButtonVisible
-            // If it isn't shimmering, the webview is ready to evaluate js.
+            // We wait until the webview finished shimmering before changing the quotes' visibility.
             if (!newMessageViewModel.isShimmering.value) {
                 if (!isQuotesButtonVisible) {
                     // User toggled show quotes visibility
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index 03b6ee3137c..a63007718c5 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -331,10 +331,10 @@ class NewMessageViewModel @Inject constructor(
             realm.write { DraftController.upsertDraftBlocking(it, realm = this) }
             it.initLiveData(signatures)
             _isShimmering.emit(false)
+            initResult.postValue(InitResult(it, signatures))
             if (bodyHasQuotes(draft.body) || bodyHasQuotes(initialBody.content)) {
                 changeQuotesButtonVisibility(isVisible = true)
             }
-            initResult.postValue(InitResult(it, signatures))
         }
 
         emit(draft)

From 10ed7bad4af7435f7e40e95cfc519b64ab52adac Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Mon, 16 Mar 2026 16:14:38 +0100
Subject: [PATCH 32/94] refactor: Fix new lines for PR

---
 .../mail/ui/newMessage/NewMessageFragment.kt  |  1 +
 .../mail/ui/newMessage/NewMessageViewModel.kt | 74 ++++---------------
 2 files changed, 16 insertions(+), 59 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 23139854e88..5d57c8be8bf 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -505,6 +505,7 @@ class NewMessageFragment : Fragment() {
     private fun observeQuotesVisibility() = viewLifecycleOwner.lifecycleScope.launch {
         newMessageViewModel.isQuotesButtonVisible.collect { isQuotesButtonVisible ->
             binding.quotesToggleButton.isVisible = isQuotesButtonVisible
+
             // We wait until the webview finished shimmering before changing the quotes' visibility.
             if (!newMessageViewModel.isShimmering.value) {
                 if (!isQuotesButtonVisible) {
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index a63007718c5..96716970094 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -191,7 +191,7 @@ class NewMessageViewModel @Inject constructor(
     var isExternalBannerManuallyClosed = false
     var draftAction = DraftAction.SAVE
     var signaturesCount = 0
-    var isNewMessage = false
+    private var isNewMessage = false
 
     private var snapshot: DraftSnapshot? = null
 
@@ -231,7 +231,8 @@ class NewMessageViewModel @Inject constructor(
     private val exitSignal: CompletableJob = Job()
 
     private val mailboxRefFlow = MutableSharedFlow<MailboxRef>(
-        replay = 1, onBufferOverflow = BufferOverflow.DROP_OLDEST
+        replay = 1,
+        onBufferOverflow = BufferOverflow.DROP_OLDEST,
     )
 
     fun changePlaceholderVisibility(isVisible: Boolean) {
@@ -247,7 +248,9 @@ class NewMessageViewModel @Inject constructor(
         mailbox
     }.shareIn(viewModelScope, SharingStarted.Lazily, replay = 1)
 
-    val currentUserIdFlow = _currentMailboxFlow.map { it.userId }.stateIn(viewModelScope, SharingStarted.Eagerly, null)
+    val currentUserIdFlow = _currentMailboxFlow
+        .map { it.userId }
+        .stateIn(viewModelScope, SharingStarted.Eagerly, null)
 
     suspend fun currentMailbox() = _currentMailboxFlow.first()
 
@@ -313,7 +316,9 @@ class NewMessageViewModel @Inject constructor(
 
         val draft: Draft? = runCatching {
 
-            signatures = currentMailbox().signatures.also { signaturesCount = it.count() }.toMutableList()
+            signatures = currentMailbox().signatures
+                .also { signaturesCount = it.count() }
+                .toMutableList()
                 .apply { add(index = 0, element = Signature.getDummySignature(appContext, email = currentMailbox().email)) }
 
             isNewMessage = !arrivedFromExistingDraft && draftLocalUuid == null
@@ -323,6 +328,7 @@ class NewMessageViewModel @Inject constructor(
         }.getOrNull()
 
         draft?.let {
+
             it.flagRecipientsAsAutomaticallyEntered()
 
             dismissNotification()
@@ -450,56 +456,6 @@ class NewMessageViewModel @Inject constructor(
         savedStateHandle[NewMessageActivityArgs::draftResource.name] = draftResource
     }
 
-    private fun splitSignatureAndQuoteFromBody(draft: Draft) {
-        val remoteBody = draft.body
-        if (remoteBody.isEmpty()) return
-
-        val (body, signature, quote) = when (draft.mimeType) {
-            Utils.TEXT_PLAIN -> BodyData(
-                body = BodyContentPayload(remoteBody, BodyContentType.TEXT_PLAIN_WITHOUT_HTML),
-                signature = null,
-                quote = null
-            )
-            Utils.TEXT_HTML -> splitSignatureAndQuoteFromHtml(remoteBody)
-            else -> error("Cannot load an email which is not of type text/plain or text/html")
-        }
-
-        initialBody = body
-        initialSignature = signature
-        initialQuote = quote
-    }
-
-    private fun splitSignatureAndQuoteFromHtml(draftBody: String): BodyData {
-
-        fun Document.split(divClassName: String, defaultValue: String): Pair<String, String?> {
-            return getElementsByClass(divClassName).firstOrNull()?.let {
-                it.remove()
-                val first = body().html()
-                val second = if (it.html().isBlank()) null else it.outerHtml()
-                first to second
-            } ?: (defaultValue to null)
-        }
-
-        fun String.lastIndexOfOrMax(string: String): Int {
-            val index = lastIndexOf(string)
-            return if (index == -1) Int.MAX_VALUE else index
-        }
-
-        val doc = jsoupParseWithLog(draftBody).also { it.outputSettings().prettyPrint(false) }
-
-        val (bodyWithQuote, signature) = doc.split(MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_CLASS_NAME, draftBody)
-
-        val replyPosition = draftBody.lastIndexOfOrMax(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME)
-        val forwardPosition = draftBody.lastIndexOfOrMax(MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME)
-        val (body, quote) = if (replyPosition < forwardPosition) {
-            doc.split(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME, bodyWithQuote)
-        } else {
-            doc.split(MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME, bodyWithQuote)
-        }
-
-        return BodyData(BodyContentPayload(body, BodyContentType.HTML_UNSANITIZED), signature, quote)
-    }
-
     private suspend fun populateWithExternalMailDataIfNeeded(draft: Draft, intent: Intent) {
         when (intent.action) {
             Intent.ACTION_SEND -> handleSingleSendIntent(draft, intent)
@@ -702,11 +658,9 @@ class NewMessageViewModel @Inject constructor(
         }
 
         if (hasExtra(Intent.EXTRA_STREAM)) {
-            (parcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri)?.let {
-                importAttachments(
-                    currentAttachments = draft.attachments, uris = listOf(it)
-                )
-            }?.let(draft.attachments::addAll)
+            (parcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri)
+                ?.let { importAttachments(currentAttachments = draft.attachments, uris = listOf(it)) }
+                ?.let(draft.attachments::addAll)
         }
     }
 
@@ -1211,6 +1165,8 @@ class NewMessageViewModel @Inject constructor(
 
     private data class SubjectAndBodyData(val subject: String, val body: String, val expirationId: Int)
 
+    data class BodyData(val body: BodyContentPayload, val signature: String?, val quote: String?)
+
     companion object {
         private val TAG = NewMessageViewModel::class.java.simpleName
 

From 47d510614be82588e2f99e1a260d7c46ec46bb79 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Mon, 16 Mar 2026 16:21:38 +0100
Subject: [PATCH 33/94] fix: Remove unnused function

---
 .../main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
index 77d756539cd..85b9f1b2692 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
@@ -63,11 +63,6 @@ object MessageBodyUtils {
         "[name=\"quote\"]", // GMX
     )
 
-    fun addSpaceAtTheEndOfQuotes(quotes: String): String {
-        // This will help the user to delete the quotes completely
-        return """$quotes<br>"""
-    }
-
     suspend fun splitContentAndQuote(body: Body): SplitBody {
 
         val bodyContent = body.value

From e6e5616a724778730eb16669cb4fb8589d159e4d Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Tue, 17 Mar 2026 16:28:31 +0100
Subject: [PATCH 34/94] feat: Remove images from inline attachment if they are
 deleted from quotes

---
 .../mail/ui/newMessage/NewMessageFragment.kt  | 17 +++--
 .../mail/ui/newMessage/NewMessageViewModel.kt |  8 +++
 .../infomaniak/mail/utils/HtmlFormatter.kt    |  6 ++
 .../com/infomaniak/mail/utils/WebViewUtils.kt | 40 ++++++++++-
 .../mail/utils/extensions/Extensions.kt       | 14 ++--
 .../main/res/raw/editor_javascript_bridge.js  | 20 ++++++
 .../main/res/raw/quotes_images_observer.js    | 66 +++++++++++++++++++
 7 files changed, 158 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/res/raw/editor_javascript_bridge.js
 create mode 100644 app/src/main/res/raw/quotes_images_observer.js

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 5d57c8be8bf..5d4eefa4030 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -92,7 +92,9 @@ import com.infomaniak.mail.utils.AccountUtils
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getCustomDarkMode
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getCustomEditorStyle
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getCustomStyle
+import com.infomaniak.mail.utils.HtmlFormatter.Companion.getEditorJsBridgeScript
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getHideQuotesStyle
+import com.infomaniak.mail.utils.HtmlFormatter.Companion.getQuotesImagesObserverScript
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getReplaceSignatureScript
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getShowQuotesScript
 import com.infomaniak.mail.utils.MessageBodyUtils
@@ -108,7 +110,8 @@ import com.infomaniak.mail.utils.extensions.bindAlertToViewLifecycle
 import com.infomaniak.mail.utils.extensions.changeToolbarColorOnScroll
 import com.infomaniak.mail.utils.extensions.enableAlgorithmicDarkening
 import com.infomaniak.mail.utils.extensions.ime
-import com.infomaniak.mail.utils.extensions.initEditorWebviewClientAndBridge
+import com.infomaniak.mail.utils.extensions.initEditorWebviewBridge
+import com.infomaniak.mail.utils.extensions.initEditorWebviewClient
 import com.infomaniak.mail.utils.extensions.navigateToDownloadProgressDialog
 import com.infomaniak.mail.utils.extensions.systemBars
 import com.infomaniak.mail.utils.extensions.valueOrEmpty
@@ -137,6 +140,8 @@ class NewMessageFragment : Fragment() {
     private val replaceSignatureScript by lazy { requireContext().getReplaceSignatureScript() }
     private val showQuotesScript by lazy { requireContext().getShowQuotesScript() }
     private val hideQuotesStyle by lazy { requireContext().getHideQuotesStyle() }
+    private val quoteImagesObserverScript by lazy { requireContext().getQuotesImagesObserverScript() }
+    private val editorJsBridgeScript by lazy { requireContext().getEditorJsBridgeScript() }
 
     private val newMessageFragmentArgs: NewMessageFragmentArgs by navArgs()
     private val newMessageViewModel: NewMessageViewModel by activityViewModels()
@@ -437,6 +442,9 @@ class NewMessageFragment : Fragment() {
     }
 
     private fun initEditorUi() = with(binding) {
+        editorWebView.initEditorWebviewBridge(onImagesDeletedFromQuotes = { cids ->
+            newMessageViewModel.deleteInlineAttachments(cids)
+        })
         editorWebView.subscribeToStates(setOf(BOLD, ITALIC, UNDERLINE, STRIKE_THROUGH, UNORDERED_LIST, CREATE_LINK))
         setEditorStyle()
         editorAiAnimation.setAnimation(R.raw.euria)
@@ -494,11 +502,12 @@ class NewMessageFragment : Fragment() {
     private fun configureUiWithDraftData(draft: Draft) = with(binding.editorWebView) {
         settings.setupNewMessageWebViewSettings()
         val alwaysShowExternalContent = localSettings.externalContent == LocalSettings.ExternalContent.ALWAYS
-        webViewClient = initEditorWebviewClientAndBridge(
+        addScript(editorJsBridgeScript)
+        webViewClient = initEditorWebviewClient(
             attachments = draft.attachments,
             shouldLoadDistantResources = alwaysShowExternalContent || newMessageViewModel.shouldLoadDistantResources(),
             navigateToNewMessageActivity = null,
-            onPageFinished = { notifyPageHasLoaded() }
+            onPageFinished = { notifyPageHasLoaded() },
         )
     }
 
@@ -511,6 +520,7 @@ class NewMessageFragment : Fragment() {
                 if (!isQuotesButtonVisible) {
                     // User toggled show quotes visibility
                     binding.editorWebView.evaluateJavascript(showQuotesScript, null)
+                    binding.editorWebView.evaluateJavascript(quoteImagesObserverScript, null)
                 } else {
                     binding.editorWebView.addCss(hideQuotesStyle, "quote-visibility")
                 }
@@ -706,7 +716,6 @@ class NewMessageFragment : Fragment() {
         editorBodyInitializer.observe(viewLifecycleOwner) { (body, isFirstInitialization) ->
             val bodyContent = editorContentManager.setContent(binding.editorWebView, body)
             if (isFirstInitialization) saveInitialSnapshot(bodyContent)
-
             setupToggleQuotesButton()
         }
     }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index 96716970094..a1d944bfc33 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -1129,6 +1129,14 @@ class NewMessageViewModel @Inject constructor(
         )
     }
 
+    fun deleteInlineAttachments(cids: List<String>) {
+        val cidsToDelete = cids.map { it.removePrefix("cid:") }
+        val newAttachments = attachmentsLiveData.value
+            ?.filter { attachment -> !cidsToDelete.contains(attachment.contentId) }
+            ?: emptyList()
+        attachmentsLiveData.postValue(newAttachments)
+    }
+
     enum class ImportationResult {
         SUCCESS,
         ATTACHMENTS_TOO_BIG,
diff --git a/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt b/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
index e71be827882..395cd2ad0ae 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
@@ -237,6 +237,8 @@ class HtmlFormatter(private val html: String) {
 
         fun Context.getShowQuotesScript(): String = loadScript(R.raw.show_quotes_script)
 
+        fun Context.getQuotesImagesObserverScript(): String = loadScript(R.raw.quotes_images_observer)
+
         fun Context.getReplaceSignatureScript(): String = loadScript(R.raw.replace_signature_script)
 
         fun Context.getFixStyleScript(): String {
@@ -246,5 +248,9 @@ class HtmlFormatter(private val html: String) {
         fun Context.getJsBridgeScript(): String {
             return loadScript(R.raw.javascript_bridge)
         }
+
+        fun Context.getEditorJsBridgeScript(): String {
+            return loadScript(R.raw.editor_javascript_bridge)
+        }
     }
 }
diff --git a/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
index 99d62957b21..4498ec9d548 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
@@ -25,6 +25,7 @@ import android.webkit.JavascriptInterface
 import android.webkit.WebSettings
 import android.webkit.WebSettings.LOAD_CACHE_ELSE_NETWORK
 import android.webkit.WebView
+import com.infomaniak.core.sentry.SentryLog
 import com.infomaniak.mail.R
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getCustomDarkMode
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getCustomStyle
@@ -36,6 +37,7 @@ import com.infomaniak.mail.utils.HtmlFormatter.Companion.getPrintMailStyle
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getResizeScript
 import com.infomaniak.mail.utils.extensions.enableAlgorithmicDarkening
 import com.infomaniak.mail.utils.extensions.loadCss
+import org.json.JSONArray
 import kotlin.math.abs
 
 class WebViewUtils(context: Context) {
@@ -81,7 +83,25 @@ class WebViewUtils(context: Context) {
         registerBreakLongWords()
     }
 
-    class JavascriptBridge(private val onWebViewFinishedLoading: (() -> Unit)? = null) {
+    class EditorJavascriptBridge(
+        private val onImagesDeletedFromQuotes: ((List<String>) -> Unit)? = null,
+    ) {
+        @JavascriptInterface
+        fun onImagesDeletedFromQuotes(cidJson: String) {
+            runCatching {
+                val cids = JSONArray(cidJson).let { jsonArray ->
+                    (0 until jsonArray.length()).map { jsonArray.getString(it) }
+                }
+                onImagesDeletedFromQuotes?.invoke(cids)
+            }.onFailure {
+                SentryLog.e(TAG, "Failed to parse CIDs")
+            }
+        }
+    }
+
+    class JavascriptBridge(
+        private val onWebViewFinishedLoading: (() -> Unit)? = null,
+    ) {
 
         @JavascriptInterface
         fun reportOverScroll(clientWidth: Int, scrollWidth: Int, messageUid: String) {
@@ -118,12 +138,26 @@ class WebViewUtils(context: Context) {
     }
 
     companion object {
+        private const val TAG = "JavascriptBridge"
         private const val DARK_BACKGROUND_STYLE_ID = "dark_background_style"
 
         lateinit var jsBridge: JavascriptBridge // TODO: Avoid excessive memory consumption with injection
+        lateinit var editorJsBridge: EditorJavascriptBridge
 
-        fun initJavascriptBridge(onWebViewFinishedLoading: (() -> Unit)? = null) {
-            jsBridge = JavascriptBridge(onWebViewFinishedLoading = onWebViewFinishedLoading)
+        fun initJavascriptBridge(
+            onWebViewFinishedLoading: (() -> Unit)? = null,
+        ) {
+            jsBridge = JavascriptBridge(
+                onWebViewFinishedLoading = onWebViewFinishedLoading,
+            )
+        }
+
+        fun initEditorJsBridge(
+            onImagesDeletedFromQuotes: ((List<String>) -> Unit)? = null,
+        ) {
+            editorJsBridge = EditorJavascriptBridge(
+                onImagesDeletedFromQuotes = onImagesDeletedFromQuotes
+            )
         }
 
         private fun WebSettings.setupCommonWebViewSettings() {
diff --git a/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt b/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt
index edefa9dae34..1690294c545 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt
@@ -117,6 +117,7 @@ import com.infomaniak.mail.utils.Utils
 import com.infomaniak.mail.utils.Utils.TAG_SEPARATOR
 import com.infomaniak.mail.utils.Utils.kSyncAccountUri
 import com.infomaniak.mail.utils.WebViewUtils
+import com.infomaniak.mail.utils.WebViewUtils.Companion.setupNewMessageWebViewSettings
 import io.realm.kotlin.query.RealmQuery
 import io.realm.kotlin.query.Sort
 import io.realm.kotlin.types.RealmInstant
@@ -293,18 +294,19 @@ fun WebView.initDisplayWebViewClientAndBridge(
     }
 }
 
-fun WebView.initEditorWebviewClientAndBridge(
+fun WebView.initEditorWebviewBridge(onImagesDeletedFromQuotes: ((List<String>) -> Unit)? = null) {
+    settings.setupNewMessageWebViewSettings()
+    WebViewUtils.initEditorJsBridge(onImagesDeletedFromQuotes)
+    addJavascriptInterface(WebViewUtils.editorJsBridge, "kmail")
+}
+
+fun WebView.initEditorWebviewClient(
     attachments: List<Attachment>,
     shouldLoadDistantResources: Boolean,
     onBlockedResourcesDetected: (() -> Unit)? = null,
     navigateToNewMessageActivity: ((Uri) -> Unit)?,
     onPageFinished: (() -> Unit)? = null,
-    onWebViewFinishedLoading: (() -> Unit)? = null,
 ): EditorWebViewClient {
-
-    WebViewUtils.initJavascriptBridge(onWebViewFinishedLoading)
-    addJavascriptInterface(WebViewUtils.jsBridge, "kmail")
-
     val cidDictionary = mutableMapOf<String, Attachment>().apply {
         attachments.forEach {
             it.contentId?.let { cid ->
diff --git a/app/src/main/res/raw/editor_javascript_bridge.js b/app/src/main/res/raw/editor_javascript_bridge.js
new file mode 100644
index 00000000000..6ebcf54317f
--- /dev/null
+++ b/app/src/main/res/raw/editor_javascript_bridge.js
@@ -0,0 +1,20 @@
+/*
+ * Infomaniak Mail - Android
+ * Copyright (C) 2026 Infomaniak Network SA
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ function onImagesDeletedFromQuotes(cids) {
+     window.kmail.onImagesDeletedFromQuotes(cids);
+ }
diff --git a/app/src/main/res/raw/quotes_images_observer.js b/app/src/main/res/raw/quotes_images_observer.js
new file mode 100644
index 00000000000..e58a5b572a8
--- /dev/null
+++ b/app/src/main/res/raw/quotes_images_observer.js
@@ -0,0 +1,66 @@
+/*
+ * Infomaniak Mail - Android
+ * Copyright (C) 2026 Infomaniak Network SA
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+(function() {
+    var mutationObserver;
+    var QUOTE_SELECTORS = '.ik_mail_quote, .forwardContentMessage';
+
+    function setupObserver() {
+        // Find all quotes containers to observe
+        var quoteElements = document.querySelectorAll(QUOTE_SELECTORS);
+        if (quoteElements.length === 0) return ;
+
+        mutationObserver = new MutationObserver(function(mutationRecords) {
+           var removedCids = [];
+
+           mutationRecords.forEach(function (mutation) {
+             for (var i, nodeIndex = 0; i = mutation.removedNodes[nodeIndex]; ++nodeIndex) {
+                if (i.nodeType == Node.ELEMENT_NODE) {
+                   if ("img" == i.tagName.toLowerCase()) {
+                       removedCids.push(i.src);
+                   } else {
+                       i = i.getElementsByTagName("img");
+                       for (var j = 0; j < i.length; j++) {
+                        removedCids.push(i[j].src)
+                       }
+                   }
+                }
+             }
+           });
+
+           // Notify if images were removed
+           if (removedCids.length > 0) {
+               onImagesDeletedFromQuotes(JSON.stringify(removedCids));
+           }
+        });
+
+        // Observe quotes containers
+        quoteElements.forEach(function(quoteElement) {
+           mutationObserver.observe(quoteElement, {
+              childList: true,
+              subtree: true,
+           })
+        })
+    }
+
+    if (document.readyState === 'loading') {
+        document.addEventListener('DOMContentLoaded', setupObserver)
+    } else {
+        setupObserver();
+    }
+})();

From 99e04caac2760f8b374c78709aea18d637d4f379 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Tue, 17 Mar 2026 16:37:47 +0100
Subject: [PATCH 35/94] fix: Fix sonar issue

---
 app/src/main/res/raw/editor_javascript_bridge.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/raw/editor_javascript_bridge.js b/app/src/main/res/raw/editor_javascript_bridge.js
index 6ebcf54317f..d4a4017c81e 100644
--- a/app/src/main/res/raw/editor_javascript_bridge.js
+++ b/app/src/main/res/raw/editor_javascript_bridge.js
@@ -16,5 +16,5 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
  function onImagesDeletedFromQuotes(cids) {
-     window.kmail.onImagesDeletedFromQuotes(cids);
+     globalThis.kmail.onImagesDeletedFromQuotes(cids);
  }

From c876e3d2577d91b37baea4dcbc7f4c27695cb472 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Wed, 18 Mar 2026 08:41:34 +0100
Subject: [PATCH 36/94] refactor: Refactor for PR

---
 .../mail/ui/newMessage/NewMessageFragment.kt     |  2 +-
 .../mail/ui/newMessage/NewMessageViewModel.kt    |  2 +-
 .../com/infomaniak/mail/utils/WebViewUtils.kt    | 16 +++++++---------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 5d4eefa4030..c51b64e2832 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -501,8 +501,8 @@ class NewMessageFragment : Fragment() {
 
     private fun configureUiWithDraftData(draft: Draft) = with(binding.editorWebView) {
         settings.setupNewMessageWebViewSettings()
-        val alwaysShowExternalContent = localSettings.externalContent == LocalSettings.ExternalContent.ALWAYS
         addScript(editorJsBridgeScript)
+        val alwaysShowExternalContent = localSettings.externalContent == LocalSettings.ExternalContent.ALWAYS
         webViewClient = initEditorWebviewClient(
             attachments = draft.attachments,
             shouldLoadDistantResources = alwaysShowExternalContent || newMessageViewModel.shouldLoadDistantResources(),
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index a1d944bfc33..95499f8c915 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -1008,7 +1008,7 @@ class NewMessageViewModel @Inject constructor(
     private fun removeEmptyQuotes(html: String): String {
         val doc = jsoupParseWithLog(html)
 
-        // If the user deleted the quotes text, remove the quotes div so user doesn't write in the quotes div
+        // If the user deleted the quotes' text, remove the quotes' div so user doesn't write in it
         // (the text could get hidden later with the toggle button).
         if (bodyHasEmptyQuotes(html)) {
             doc.getElementsByClass(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME).forEach { it.remove() }
diff --git a/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
index 4498ec9d548..8f6624dbab6 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
@@ -89,9 +89,11 @@ class WebViewUtils(context: Context) {
         @JavascriptInterface
         fun onImagesDeletedFromQuotes(cidJson: String) {
             runCatching {
-                val cids = JSONArray(cidJson).let { jsonArray ->
-                    (0 until jsonArray.length()).map { jsonArray.getString(it) }
-                }
+                val cids = JSONArray(cidJson)
+                    .let { jsonArray ->
+                        (0 until jsonArray.length())
+                            .map { jsonArray.getString(it) }
+                    }
                 onImagesDeletedFromQuotes?.invoke(cids)
             }.onFailure {
                 SentryLog.e(TAG, "Failed to parse CIDs")
@@ -147,17 +149,13 @@ class WebViewUtils(context: Context) {
         fun initJavascriptBridge(
             onWebViewFinishedLoading: (() -> Unit)? = null,
         ) {
-            jsBridge = JavascriptBridge(
-                onWebViewFinishedLoading = onWebViewFinishedLoading,
-            )
+            jsBridge = JavascriptBridge(onWebViewFinishedLoading = onWebViewFinishedLoading)
         }
 
         fun initEditorJsBridge(
             onImagesDeletedFromQuotes: ((List<String>) -> Unit)? = null,
         ) {
-            editorJsBridge = EditorJavascriptBridge(
-                onImagesDeletedFromQuotes = onImagesDeletedFromQuotes
-            )
+            editorJsBridge = EditorJavascriptBridge(onImagesDeletedFromQuotes = onImagesDeletedFromQuotes)
         }
 
         private fun WebSettings.setupCommonWebViewSettings() {

From c5b636f1aa266c763992d977baaa70468ec1f7d6 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Wed, 18 Mar 2026 09:23:36 +0100
Subject: [PATCH 37/94] refactor: Add comment on munge script and add missing
 semicolons in quotes images observer

---
 app/src/main/res/raw/munge_email.js            |  1 +
 app/src/main/res/raw/quotes_images_observer.js | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/raw/munge_email.js b/app/src/main/res/raw/munge_email.js
index f4fdd009d66..e8c756b95d8 100644
--- a/app/src/main/res/raw/munge_email.js
+++ b/app/src/main/res/raw/munge_email.js
@@ -18,6 +18,7 @@ const scriptFirstLine = new RegExp(/:([\d]+)/).exec(Error().stack)[1] // Android
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+// The line below is injected by the code.
 // MESSAGE_SELECTOR = "#kmail-message-content";
 const PREFERENCES = {
     normalizeMessageWidths: true,
diff --git a/app/src/main/res/raw/quotes_images_observer.js b/app/src/main/res/raw/quotes_images_observer.js
index e58a5b572a8..7f4c41fcc67 100644
--- a/app/src/main/res/raw/quotes_images_observer.js
+++ b/app/src/main/res/raw/quotes_images_observer.js
@@ -29,14 +29,14 @@
            var removedCids = [];
 
            mutationRecords.forEach(function (mutation) {
-             for (var i, nodeIndex = 0; i = mutation.removedNodes[nodeIndex]; ++nodeIndex) {
-                if (i.nodeType == Node.ELEMENT_NODE) {
-                   if ("img" == i.tagName.toLowerCase()) {
-                       removedCids.push(i.src);
+             for (var removedNode, nodeIndex = 0; removedNode = mutation.removedNodes[nodeIndex]; ++nodeIndex) {
+                if (removedNode.nodeType == Node.ELEMENT_NODE) {
+                   if ("img" == removedNode.tagName.toLowerCase()) {
+                       removedCids.push(removedNode.src);
                    } else {
-                       i = i.getElementsByTagName("img");
-                       for (var j = 0; j < i.length; j++) {
-                        removedCids.push(i[j].src)
+                       var childImages = removedNode.getElementsByTagName("img");
+                       for (var childIndex = 0; childIndex < childImages.length; childIndex++) {
+                        removedCids.push(childImages[childIndex].src);
                        }
                    }
                 }
@@ -59,7 +59,7 @@
     }
 
     if (document.readyState === 'loading') {
-        document.addEventListener('DOMContentLoaded', setupObserver)
+        document.addEventListener('DOMContentLoaded', setupObserver);
     } else {
         setupObserver();
     }

From 11a6d51331c9b3cb43430da7d62ee83664c85654 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Wed, 18 Mar 2026 10:31:09 +0100
Subject: [PATCH 38/94] fix: Fix signature update

---
 .../com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt   | 4 +++-
 .../com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt  | 4 +---
 app/src/main/res/raw/replace_signature_script.js              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index c51b64e2832..66cb2525d52 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -578,7 +578,9 @@ class NewMessageFragment : Fragment() {
     }
 
     private fun updateBodySignature(signature: Signature) {
-        val escapedSignature = if (signature.isDummy) "" else looselyEscapeAsStringLiteralForJs(signature.content)
+        val selectedSignature = if (signature.isDummy) "" else signature.content
+        val signatureWithClass = signatureUtils.encapsulateSignatureContentWithInfomaniakClass(selectedSignature)
+        val escapedSignature = looselyEscapeAsStringLiteralForJs(signatureWithClass)
 
         val replaceSignatureScript = replaceSignatureScript.format(
             MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_CLASS_NAME,
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index 95499f8c915..ecbf41cb40d 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -390,9 +390,7 @@ class NewMessageViewModel @Inject constructor(
         with(draftInitManager) {
             val signature = chooseSignature(currentMailbox().email, signatures, draftMode, previousMessage)
             setSignatureIdentity(signature)
-            if (signature.content.isNotEmpty()) {
-                initialSignature = signatureUtils.encapsulateSignatureContentWithInfomaniakClass(signature.content)
-            }
+            initialSignature = signatureUtils.encapsulateSignatureContentWithInfomaniakClass(signature.content)
         }
 
         populateWithExternalMailDataIfNeeded(draft = this, intent)
diff --git a/app/src/main/res/raw/replace_signature_script.js b/app/src/main/res/raw/replace_signature_script.js
index d93c141fe97..a9e61880a17 100644
--- a/app/src/main/res/raw/replace_signature_script.js
+++ b/app/src/main/res/raw/replace_signature_script.js
@@ -23,7 +23,7 @@
         if (newSigHtml === "") {
             signatureElement.remove();
         } else {
-            signatureElement.innerHTML = newSigHtml;
+            signatureElement.outerHTML = newSigHtml;
         }
     } else if (newSigHtml !== "") {
         const quotes = document.querySelector('.%s');

From 0ed1219aa1454f8f84a3ba6407b74a8430527b4a Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Wed, 18 Mar 2026 13:09:10 +0100
Subject: [PATCH 39/94] fix: Remove spellcheck in signature

---
 .../src/main/java/com/infomaniak/html/cleaner/BodyCleaner.kt    | 2 +-
 app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/HtmlCleaner/src/main/java/com/infomaniak/html/cleaner/BodyCleaner.kt b/HtmlCleaner/src/main/java/com/infomaniak/html/cleaner/BodyCleaner.kt
index b94a55cc595..32b4071465e 100644
--- a/HtmlCleaner/src/main/java/com/infomaniak/html/cleaner/BodyCleaner.kt
+++ b/HtmlCleaner/src/main/java/com/infomaniak/html/cleaner/BodyCleaner.kt
@@ -47,7 +47,7 @@ internal class BodyCleaner {
                 "var",
                 "wbr",
             )
-            .addAttributes(":all", "class", "dir", "id", "style", "spellcheck")
+            .addAttributes(":all", "class", "dir", "id", "style")
             .addAttributes("a", "name")
             // Allow all URI schemes in links.
             // Removing all protocols makes the list of protocols empty, which means allow all protocols.
diff --git a/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt
index 96c1bbabb28..c788a9605a4 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt
@@ -25,7 +25,7 @@ import javax.inject.Singleton
 class SignatureUtils @Inject constructor() {
     fun encapsulateSignatureContentWithInfomaniakClass(signatureContent: String): String {
         return """
-            <div class="$INFOMANIAK_SIGNATURE_HTML_CLASS_NAME" spellcheck="false">
+            <div class="$INFOMANIAK_SIGNATURE_HTML_CLASS_NAME">
             $signatureContent
             </div>
         """.trimIndent()

From 30d89f8313a4c3761ea5387df87dc34c3a202700 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Fri, 20 Mar 2026 15:24:17 +0100
Subject: [PATCH 40/94] fix: Fix bodyHasQuotes functions

---
 .../com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index ecbf41cb40d..5574b83fac8 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -544,8 +544,9 @@ class NewMessageViewModel @Inject constructor(
     }
 
     private fun bodyHasQuotes(body: String): Boolean {
-        return body.contains(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME) ||
-                body.contains(MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME)
+        val doc = jsoupParseWithLog(body)
+        return doc.getElementsByClass(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME).isNotEmpty() ||
+                doc.getElementsByClass(MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME).isNotEmpty()
     }
 
     fun bodyIsEmpty(bodyHtml: String): Boolean {

From f6f4ca05c687eab2ec9f5283d9e5d485ebecced3 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Wed, 25 Mar 2026 10:18:48 +0100
Subject: [PATCH 41/94] fix: Fix empty body logic and refactor

---
 .../mail/ui/newMessage/NewMessageFragment.kt  |  2 +-
 .../mail/ui/newMessage/NewMessageViewModel.kt | 60 ++++---------------
 .../infomaniak/mail/utils/MessageBodyUtils.kt | 57 ++++++++++++++++--
 .../com/infomaniak/mail/utils/WebViewUtils.kt | 10 +---
 4 files changed, 68 insertions(+), 61 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 66cb2525d52..9db65fa05f8 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -476,7 +476,7 @@ class NewMessageFragment : Fragment() {
         if (initResult.value == null) {
             initDraftAndViewModel(intent = requireActivity().intent).observe(viewLifecycleOwner) { draft ->
                 if (draft != null) {
-                    val isBodyEmpty = newMessageViewModel.bodyIsEmpty(draft.body)
+                    val isBodyEmpty = MessageBodyUtils.isBodyEmpty(draft)
                     changePlaceholderVisibility(isVisible = isBodyEmpty)
                     showKeyboardInCorrectView(isToFieldEmpty = draft.to.isEmpty())
                     binding.subjectTextField.setText(draft.subject)
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index 5574b83fac8..c887eaa888f 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -123,6 +123,7 @@ import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapLatest
@@ -131,7 +132,6 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.invoke
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.jsoup.nodes.Document
 import splitties.experimental.ExperimentalSplittiesApi
 import java.util.Date
 import javax.inject.Inject
@@ -222,10 +222,10 @@ class NewMessageViewModel @Inject constructor(
     val isShimmering: StateFlow<Boolean> = _isShimmering
 
     private val _isQuotesButtonVisible = MutableStateFlow(false)
-    val isQuotesButtonVisible: StateFlow<Boolean> = _isQuotesButtonVisible
+    val isQuotesButtonVisible: StateFlow<Boolean> = _isQuotesButtonVisible.asStateFlow()
 
     private val _isPlaceHolderVisible = MutableStateFlow(false)
-    val isPlaceHolderVisible: StateFlow<Boolean> = _isPlaceHolderVisible
+    val isPlaceHolderVisible: StateFlow<Boolean> = _isPlaceHolderVisible.asStateFlow()
 
     //region Check mailbox existence
     private val exitSignal: CompletableJob = Job()
@@ -235,10 +235,6 @@ class NewMessageViewModel @Inject constructor(
         onBufferOverflow = BufferOverflow.DROP_OLDEST,
     )
 
-    fun changePlaceholderVisibility(isVisible: Boolean) {
-        _isPlaceHolderVisible.value = isVisible
-    }
-
     private val _currentMailboxFlow: Flow<Mailbox> = mailboxRefFlow.mapLatest {
         val mailbox = mailboxController.getMailbox(it.userId, it.mailboxId)
         if (mailbox == null) {
@@ -337,10 +333,10 @@ class NewMessageViewModel @Inject constructor(
             realm.write { DraftController.upsertDraftBlocking(it, realm = this) }
             it.initLiveData(signatures)
             _isShimmering.emit(false)
-            initResult.postValue(InitResult(it, signatures))
-            if (bodyHasQuotes(draft.body) || bodyHasQuotes(initialBody.content)) {
+            if (initialBody.hasQuotes()) {
                 changeQuotesButtonVisibility(isVisible = true)
             }
+            initResult.postValue(InitResult(it, signatures))
         }
 
         emit(draft)
@@ -543,52 +539,22 @@ class NewMessageViewModel @Inject constructor(
         isEncryptionActivated.postValue(isEncrypted)
     }
 
-    private fun bodyHasQuotes(body: String): Boolean {
-        val doc = jsoupParseWithLog(body)
+    private fun BodyContentPayload.hasQuotes(): Boolean {
+        if (type == BodyContentType.TEXT_PLAIN_WITHOUT_HTML || type == BodyContentType.TEXT_PLAIN_WITH_HTML) return false
+
+        val doc = jsoupParseWithLog(content)
         return doc.getElementsByClass(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME).isNotEmpty() ||
                 doc.getElementsByClass(MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME).isNotEmpty()
     }
 
-    fun bodyIsEmpty(bodyHtml: String): Boolean {
-        val body = getBodyWithoutSignatureAndQuotes(bodyHtml)
-        return body.isBlank()
-    }
-
-    private fun getBodyWithoutSignatureAndQuotes(draftBody: String): String {
-
-        fun Document.split(divClassName: String, defaultValue: String): Pair<String, String?> {
-            return getElementsByClass(divClassName).firstOrNull()?.let {
-                it.remove()
-                val first = body().html()
-                val second = if (it.html().isBlank()) null else it.outerHtml()
-                first to second
-            } ?: (defaultValue to null)
-        }
-
-        fun String.lastIndexOfOrMax(string: String): Int {
-            val index = lastIndexOf(string)
-            return if (index == -1) Int.MAX_VALUE else index
-        }
-
-        val doc = jsoupParseWithLog(draftBody).also { it.outputSettings().prettyPrint(false) }
-
-        val (bodyWithQuote) = doc.split(MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_CLASS_NAME, draftBody)
-
-        val replyPosition = draftBody.lastIndexOfOrMax(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME)
-        val forwardPosition = draftBody.lastIndexOfOrMax(MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME)
-        val (body) = if (replyPosition < forwardPosition) {
-            doc.split(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME, bodyWithQuote)
-        } else {
-            doc.split(MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME, bodyWithQuote)
-        }
-
-        return body.htmlToText()
-    }
-
     fun changeQuotesButtonVisibility(isVisible: Boolean) {
         _isQuotesButtonVisible.value = isVisible
     }
 
+    fun changePlaceholderVisibility(isVisible: Boolean) {
+        _isPlaceHolderVisible.value = isVisible
+    }
+
     private suspend fun getLocalOrRemoteDraft(localUuid: String?): Draft? {
 
         @Suppress("UNUSED_PARAMETER")
diff --git a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
index 85b9f1b2692..f42501afe6e 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
@@ -18,12 +18,14 @@
 package com.infomaniak.mail.utils
 
 import android.content.Context
+import com.infomaniak.mail.data.models.draft.Draft
 import com.infomaniak.mail.data.models.message.Body
 import com.infomaniak.mail.data.models.message.Message
 import com.infomaniak.mail.data.models.message.SubBody
 import com.infomaniak.mail.utils.JsoupParserUtil.jsoupParseWithLog
 import com.infomaniak.mail.utils.JsoupParserUtil.measureAndLogMemoryUsage
 import com.infomaniak.mail.utils.PrintHeaderUtils.createPrintHeader
+import com.infomaniak.mail.utils.extensions.htmlToText
 import io.sentry.Sentry
 import io.sentry.SentryLevel
 import kotlinx.coroutines.CoroutineScope
@@ -63,6 +65,7 @@ object MessageBodyUtils {
         "[name=\"quote\"]", // GMX
     )
 
+    //region Split
     suspend fun splitContentAndQuote(body: Body): SplitBody {
 
         val bodyContent = body.value
@@ -113,12 +116,51 @@ object MessageBodyUtils {
         return htmlDocument.outerHtml() to quotes
     }
 
-    fun addPrintHeader(context: Context, message: Message, htmlDocument: Document) {
-        htmlDocument.body().apply {
-            attr("style", "margin: 40px")
-            insertChildren(0, createPrintHeader(context, message))
+    fun isBodyEmpty(draft: Draft): Boolean {
+        val remoteBody = draft.body
+        if (remoteBody.isEmpty()) return true
+
+        return when (draft.mimeType) {
+            Utils.TEXT_PLAIN -> remoteBody
+            Utils.TEXT_HTML -> getBodyWithoutSignatureAndQuotesFromHtml(remoteBody)
+            else -> error("Cannot load an email which is not of type text/plain or text/html")
+        }.isEmpty()
+    }
+
+    /**
+     * This only takes into account infomaniak's quotes and signatures.
+     */
+    private fun getBodyWithoutSignatureAndQuotesFromHtml(draftBody: String): String {
+
+        fun Document.split(divClassName: String, defaultValue: String): Pair<String, String?> {
+            return getElementsByClass(divClassName).firstOrNull()?.let {
+                it.remove()
+                val first = body().html()
+                val second = if (it.html().isBlank()) null else it.outerHtml()
+                first to second
+            } ?: (defaultValue to null)
+        }
+
+        fun String.lastIndexOfOrMax(string: String): Int {
+            val index = lastIndexOf(string)
+            return if (index == -1) Int.MAX_VALUE else index
+        }
+
+        val doc = jsoupParseWithLog(draftBody).also { it.outputSettings().prettyPrint(false) }
+
+        val (bodyWithQuote) = doc.split(MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_CLASS_NAME, draftBody)
+
+        val replyPosition = draftBody.lastIndexOfOrMax(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME)
+        val forwardPosition = draftBody.lastIndexOfOrMax(MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME)
+        val (body) = if (replyPosition < forwardPosition) {
+            doc.split(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME, bodyWithQuote)
+        } else {
+            doc.split(MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME, bodyWithQuote)
         }
+
+        return body.htmlToText()
     }
+    //endregion
 
     fun mergeSplitBodyAndSubBodies(body: String, subBodies: List<SubBody>): String {
         return body + formatSubBodiesContent(subBodies)
@@ -137,6 +179,13 @@ object MessageBodyUtils {
         return subBodiesContent
     }
 
+    fun addPrintHeader(context: Context, message: Message, htmlDocument: Document) {
+        htmlDocument.body().apply {
+            attr("style", "margin: 40px")
+            insertChildren(0, createPrintHeader(context, message))
+        }
+    }
+
     //region Utils
     /**
      * Some Email clients rename CSS classes to prefix them.
diff --git a/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
index 8f6624dbab6..f647a08c65a 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
@@ -90,10 +90,7 @@ class WebViewUtils(context: Context) {
         fun onImagesDeletedFromQuotes(cidJson: String) {
             runCatching {
                 val cids = JSONArray(cidJson)
-                    .let { jsonArray ->
-                        (0 until jsonArray.length())
-                            .map { jsonArray.getString(it) }
-                    }
+                    .let { jsonArray -> (0 until jsonArray.length()).map { jsonArray.getString(it) } }
                 onImagesDeletedFromQuotes?.invoke(cids)
             }.onFailure {
                 SentryLog.e(TAG, "Failed to parse CIDs")
@@ -200,11 +197,6 @@ class WebViewUtils(context: Context) {
             evaluateJavascript(removeBackgroundStyleScript, null)
         }
 
-        fun WebView.destroyAndClearHistory() {
-            clearHistory()
-            destroy()
-        }
-
         /**
          * Lets the WebView take the zoom gestures and lets the WebView handle scrolls that start horizontally while letting the
          * parent handle scrolls that start vertically. This is not perfect but the best solution is way more complex.

From 2bdb58aef1449b5bb376c9c5c73f9d8d5552015d Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Wed, 25 Mar 2026 10:38:27 +0100
Subject: [PATCH 42/94] fix: Take into account blank characters when displaying
 placeholder

---
 .../mail/ui/newMessage/NewMessageFragment.kt     |  2 +-
 .../infomaniak/mail/utils/MessageBodyUtils.kt    | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 9db65fa05f8..8cae6387dd0 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -476,7 +476,7 @@ class NewMessageFragment : Fragment() {
         if (initResult.value == null) {
             initDraftAndViewModel(intent = requireActivity().intent).observe(viewLifecycleOwner) { draft ->
                 if (draft != null) {
-                    val isBodyEmpty = MessageBodyUtils.isBodyEmpty(draft)
+                    val isBodyEmpty = MessageBodyUtils.isBodyBlank(draft)
                     changePlaceholderVisibility(isVisible = isBodyEmpty)
                     showKeyboardInCorrectView(isToFieldEmpty = draft.to.isEmpty())
                     binding.subjectTextField.setText(draft.subject)
diff --git a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
index f42501afe6e..e68d3da2bea 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
@@ -116,15 +116,15 @@ object MessageBodyUtils {
         return htmlDocument.outerHtml() to quotes
     }
 
-    fun isBodyEmpty(draft: Draft): Boolean {
+    fun isBodyBlank(draft: Draft): Boolean {
         val remoteBody = draft.body
-        if (remoteBody.isEmpty()) return true
+        if (remoteBody.isBlank()) return true
 
         return when (draft.mimeType) {
             Utils.TEXT_PLAIN -> remoteBody
             Utils.TEXT_HTML -> getBodyWithoutSignatureAndQuotesFromHtml(remoteBody)
             else -> error("Cannot load an email which is not of type text/plain or text/html")
-        }.isEmpty()
+        }.isBlank()
     }
 
     /**
@@ -148,14 +148,14 @@ object MessageBodyUtils {
 
         val doc = jsoupParseWithLog(draftBody).also { it.outputSettings().prettyPrint(false) }
 
-        val (bodyWithQuote) = doc.split(MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_CLASS_NAME, draftBody)
+        val (bodyWithQuote) = doc.split(INFOMANIAK_SIGNATURE_HTML_CLASS_NAME, draftBody)
 
-        val replyPosition = draftBody.lastIndexOfOrMax(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME)
-        val forwardPosition = draftBody.lastIndexOfOrMax(MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME)
+        val replyPosition = draftBody.lastIndexOfOrMax(INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME)
+        val forwardPosition = draftBody.lastIndexOfOrMax(INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME)
         val (body) = if (replyPosition < forwardPosition) {
-            doc.split(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME, bodyWithQuote)
+            doc.split(INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME, bodyWithQuote)
         } else {
-            doc.split(MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME, bodyWithQuote)
+            doc.split(INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME, bodyWithQuote)
         }
 
         return body.htmlToText()

From 7eef5d903f399d2d3b193ea35b328110a9a06c4c Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Wed, 25 Mar 2026 10:40:53 +0100
Subject: [PATCH 43/94] refactor: Use globalThis instead of window to follow
 standards

---
 app/src/main/res/raw/javascript_bridge.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/raw/javascript_bridge.js b/app/src/main/res/raw/javascript_bridge.js
index 7d9c1f1315d..b8feda9a408 100644
--- a/app/src/main/res/raw/javascript_bridge.js
+++ b/app/src/main/res/raw/javascript_bridge.js
@@ -17,13 +17,13 @@
  */
 
 function reportOverScroll(clientWidth, scrollWidth, messageUid) {
-    window.kmail.reportOverScroll(clientWidth, scrollWidth, messageUid);
+    globalThis.kmail.reportOverScroll(clientWidth, scrollWidth, messageUid);
 }
 
 function reportError(error, scriptFirstLine, messageUid) {
-    window.kmail.reportError(error.name, error.message, error.stack, scriptFirstLine, messageUid);
+    globalThis.kmail.reportError(error.name, error.message, error.stack, scriptFirstLine, messageUid);
 }
 
 function webviewFinishedLoading() {
-    window.kmail.webviewFinishedLoading();
+    globalThis.kmail.webviewFinishedLoading();
 }

From dc85c5528efdbe443b7d7b8e516ee9e2cc105972 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Wed, 25 Mar 2026 10:44:18 +0100
Subject: [PATCH 44/94] refactor: Remove unused strings

---
 app/src/main/res/values-da/strings.xml | 2 --
 app/src/main/res/values-de/strings.xml | 2 --
 app/src/main/res/values-el/strings.xml | 2 --
 app/src/main/res/values-es/strings.xml | 2 --
 app/src/main/res/values-fi/strings.xml | 2 --
 app/src/main/res/values-fr/strings.xml | 2 --
 app/src/main/res/values-it/strings.xml | 2 --
 app/src/main/res/values-nb/strings.xml | 2 --
 app/src/main/res/values-nl/strings.xml | 2 --
 app/src/main/res/values-pl/strings.xml | 2 --
 app/src/main/res/values-pt/strings.xml | 2 --
 app/src/main/res/values-sv/strings.xml | 2 --
 app/src/main/res/values/strings.xml    | 2 --
 13 files changed, 26 deletions(-)

diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index c38fa7696ec..788e853c1ed 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -179,8 +179,6 @@
     <string name="contentDescriptionButtonDelete">Slet %s</string>
     <string name="contentDescriptionButtonDeleteDraft">Slet kladde</string>
     <string name="contentDescriptionButtonDeleteHistory">Slet historikpost</string>
-    <string name="contentDescriptionButtonDeleteQuote">Slet citerede beskeder</string>
-    <string name="contentDescriptionButtonDeleteSignature">Slet signatur</string>
     <string name="contentDescriptionButtonExpandAccountSelection">Udvid kontovalg</string>
     <string name="contentDescriptionButtonExpandCustomFolders">Udvid tilpassede mapper</string>
     <string name="contentDescriptionButtonExpandFolder">Udvid mappe %s</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 38d0c348c62..31f6e275dbe 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -179,8 +179,6 @@
     <string name="contentDescriptionButtonDelete">%s löschen</string>
     <string name="contentDescriptionButtonDeleteDraft">Entwurf löschen</string>
     <string name="contentDescriptionButtonDeleteHistory">Historieneintrag löschen</string>
-    <string name="contentDescriptionButtonDeleteQuote">Zitierte Nachrichten löschen</string>
-    <string name="contentDescriptionButtonDeleteSignature">Unterschrift löschen</string>
     <string name="contentDescriptionButtonExpandAccountSelection">Kontoauswahl erweitern</string>
     <string name="contentDescriptionButtonExpandCustomFolders">Erweitern von benutzerdefinierten Ordnern</string>
     <string name="contentDescriptionButtonExpandFolder">Ordner erweitern %s</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index a3ec193a193..82a9455afeb 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -179,8 +179,6 @@
     <string name="contentDescriptionButtonDelete">Διαγραφή %s</string>
     <string name="contentDescriptionButtonDeleteDraft">Διαγραφή προχείρου</string>
     <string name="contentDescriptionButtonDeleteHistory">Διαγραφή καταχώρησης ιστορικού</string>
-    <string name="contentDescriptionButtonDeleteQuote">Διαγραφή παρατιθέμενων μηνυμάτων</string>
-    <string name="contentDescriptionButtonDeleteSignature">Διαγραφή υπογραφής</string>
     <string name="contentDescriptionButtonExpandAccountSelection">Ανάπτυξη επιλογής λογαριασμού</string>
     <string name="contentDescriptionButtonExpandCustomFolders">Ανάπτυξη προσαρμοσμένων φακέλων</string>
     <string name="contentDescriptionButtonExpandFolder">Ανάπτυξη φακέλου %s</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 8111d7cbdeb..13b6d0cacc2 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -179,8 +179,6 @@
     <string name="contentDescriptionButtonDelete">Borrar %s</string>
     <string name="contentDescriptionButtonDeleteDraft">Borrar borrador</string>
     <string name="contentDescriptionButtonDeleteHistory">Borrar entrada del historial</string>
-    <string name="contentDescriptionButtonDeleteQuote">Borrar mensajes citados</string>
-    <string name="contentDescriptionButtonDeleteSignature">Borrar firma</string>
     <string name="contentDescriptionButtonExpandAccountSelection">Ampliar la selección de cuentas</string>
     <string name="contentDescriptionButtonExpandCustomFolders">Ampliar carpetas personalizadas</string>
     <string name="contentDescriptionButtonExpandFolder">Ampliar la carpeta %s</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index bd29e2881cf..5bfbd70693e 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -179,8 +179,6 @@
     <string name="contentDescriptionButtonDelete">Poista %s</string>
     <string name="contentDescriptionButtonDeleteDraft">Poista luonnos</string>
     <string name="contentDescriptionButtonDeleteHistory">Poista historiatietue</string>
-    <string name="contentDescriptionButtonDeleteQuote">Poista lainatut viestit</string>
-    <string name="contentDescriptionButtonDeleteSignature">Poista allekirjoitus</string>
     <string name="contentDescriptionButtonExpandAccountSelection">Laajenna tilin valinta</string>
     <string name="contentDescriptionButtonExpandCustomFolders">Laajenna mukautetut kansiot</string>
     <string name="contentDescriptionButtonExpandFolder">Laajenna kansio %s</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 237020638a0..c52761f3ddf 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -179,8 +179,6 @@
     <string name="contentDescriptionButtonDelete">Supprimer %s</string>
     <string name="contentDescriptionButtonDeleteDraft">Supprimer le brouillon</string>
     <string name="contentDescriptionButtonDeleteHistory">Supprimer l’entrée de l’historique</string>
-    <string name="contentDescriptionButtonDeleteQuote">Supprimer les messages cités</string>
-    <string name="contentDescriptionButtonDeleteSignature">Supprimer la signature</string>
     <string name="contentDescriptionButtonExpandAccountSelection">Déplier la sélection de compte</string>
     <string name="contentDescriptionButtonExpandCustomFolders">Déplier les dossiers personnalisés</string>
     <string name="contentDescriptionButtonExpandFolder">Déplier le dossier %s</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index a85a370073d..3c60fcb3d5d 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -179,8 +179,6 @@
     <string name="contentDescriptionButtonDelete">Cancella %s</string>
     <string name="contentDescriptionButtonDeleteDraft">Cancella la bozza</string>
     <string name="contentDescriptionButtonDeleteHistory">Cancella la voce della cronologia</string>
-    <string name="contentDescriptionButtonDeleteQuote">Elimina i messaggi citati</string>
-    <string name="contentDescriptionButtonDeleteSignature">Cancella la firma</string>
     <string name="contentDescriptionButtonExpandAccountSelection">Ampliare la selezione degli account</string>
     <string name="contentDescriptionButtonExpandCustomFolders">Espandi le cartelle personalizzate</string>
     <string name="contentDescriptionButtonExpandFolder">Espandi la cartella %s</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index c695dc6806a..58e07aab19d 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -179,8 +179,6 @@
     <string name="contentDescriptionButtonDelete">Slett %s</string>
     <string name="contentDescriptionButtonDeleteDraft">Slett utkast</string>
     <string name="contentDescriptionButtonDeleteHistory">Slett historikkoppføring</string>
-    <string name="contentDescriptionButtonDeleteQuote">Slett siterte meldinger</string>
-    <string name="contentDescriptionButtonDeleteSignature">Slett signatur</string>
     <string name="contentDescriptionButtonExpandAccountSelection">Utvid kontovalg</string>
     <string name="contentDescriptionButtonExpandCustomFolders">Utvid egendefinerte mapper</string>
     <string name="contentDescriptionButtonExpandFolder">Utvid mappe %s</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index b678be346c2..5022776dfa1 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -179,8 +179,6 @@
     <string name="contentDescriptionButtonDelete">%s verwijderen</string>
     <string name="contentDescriptionButtonDeleteDraft">Concept verwijderen</string>
     <string name="contentDescriptionButtonDeleteHistory">Geschiedenisingang verwijderen</string>
-    <string name="contentDescriptionButtonDeleteQuote">Geciteerde berichten verwijderen</string>
-    <string name="contentDescriptionButtonDeleteSignature">Handtekening verwijderen</string>
     <string name="contentDescriptionButtonExpandAccountSelection">Accountselectie uitklappen</string>
     <string name="contentDescriptionButtonExpandCustomFolders">Aangepaste mappen uitklappen</string>
     <string name="contentDescriptionButtonExpandFolder">Map %s uitklappen</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index af9d595dde4..3fea2287c8c 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -181,8 +181,6 @@
     <string name="contentDescriptionButtonDelete">Usuń %s</string>
     <string name="contentDescriptionButtonDeleteDraft">Usuń wersję roboczą</string>
     <string name="contentDescriptionButtonDeleteHistory">Usuń wpis historii</string>
-    <string name="contentDescriptionButtonDeleteQuote">Usuń zacytowane wiadomości</string>
-    <string name="contentDescriptionButtonDeleteSignature">Usuń podpis</string>
     <string name="contentDescriptionButtonExpandAccountSelection">Rozwiń wybór konta</string>
     <string name="contentDescriptionButtonExpandCustomFolders">Rozwiń niestandardowe foldery</string>
     <string name="contentDescriptionButtonExpandFolder">Rozwiń folder %s</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 30bfc92e3bf..4525d5eb6bd 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -179,8 +179,6 @@
     <string name="contentDescriptionButtonDelete">Eliminar %s</string>
     <string name="contentDescriptionButtonDeleteDraft">Eliminar o rascunho</string>
     <string name="contentDescriptionButtonDeleteHistory">Eliminar entrada do histórico</string>
-    <string name="contentDescriptionButtonDeleteQuote">Eliminar mensagens citadas</string>
-    <string name="contentDescriptionButtonDeleteSignature">Eliminar assinatura</string>
     <string name="contentDescriptionButtonExpandAccountSelection">Expandir seleção de conta</string>
     <string name="contentDescriptionButtonExpandCustomFolders">Expandir pastas personalizadas</string>
     <string name="contentDescriptionButtonExpandFolder">Expandir pasta %s</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index fea697360a6..910b4d4791b 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -179,8 +179,6 @@
     <string name="contentDescriptionButtonDelete">Ta bort %s</string>
     <string name="contentDescriptionButtonDeleteDraft">Ta bort utkast</string>
     <string name="contentDescriptionButtonDeleteHistory">Ta bort historikpost</string>
-    <string name="contentDescriptionButtonDeleteQuote">Ta bort citerade meddelanden</string>
-    <string name="contentDescriptionButtonDeleteSignature">Ta bort signatur</string>
     <string name="contentDescriptionButtonExpandAccountSelection">Expandera kontoval</string>
     <string name="contentDescriptionButtonExpandCustomFolders">Expandera anpassade mappar</string>
     <string name="contentDescriptionButtonExpandFolder">Expandera mapp %s</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d035ece8e30..1ab9078f6fe 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -184,8 +184,6 @@
     <string name="contentDescriptionButtonDelete">Delete %s</string>
     <string name="contentDescriptionButtonDeleteDraft">Delete draft</string>
     <string name="contentDescriptionButtonDeleteHistory">Delete history entry</string>
-    <string name="contentDescriptionButtonDeleteQuote">Delete quoted messages</string>
-    <string name="contentDescriptionButtonDeleteSignature">Delete signature</string>
     <string name="contentDescriptionButtonExpandAccountSelection">Expand account selection</string>
     <string name="contentDescriptionButtonExpandCustomFolders">Expand custom folders</string>
     <string name="contentDescriptionButtonExpandFolder">Expand folder %s</string>

From 2e058508bb8fa99610ae7a01781513b16572dbcf Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Wed, 25 Mar 2026 11:17:48 +0100
Subject: [PATCH 45/94] refactor: Extract javascript bridges to their own file

---
 .../EditorJavascriptBridge.kt                 | 42 +++++++++++
 .../MessageDisplayJavascriptBridge.kt         | 59 +++++++++++++++
 .../mail/ui/newMessage/NewMessageFragment.kt  |  4 +-
 .../com/infomaniak/mail/utils/WebViewUtils.kt | 71 ++-----------------
 .../mail/utils/extensions/Extensions.kt       |  8 +--
 5 files changed, 112 insertions(+), 72 deletions(-)
 create mode 100644 app/src/main/java/com/infomaniak/mail/data/models/javascriptBridge/EditorJavascriptBridge.kt
 create mode 100644 app/src/main/java/com/infomaniak/mail/data/models/javascriptBridge/MessageDisplayJavascriptBridge.kt

diff --git a/app/src/main/java/com/infomaniak/mail/data/models/javascriptBridge/EditorJavascriptBridge.kt b/app/src/main/java/com/infomaniak/mail/data/models/javascriptBridge/EditorJavascriptBridge.kt
new file mode 100644
index 00000000000..bdd2f3c8f00
--- /dev/null
+++ b/app/src/main/java/com/infomaniak/mail/data/models/javascriptBridge/EditorJavascriptBridge.kt
@@ -0,0 +1,42 @@
+/*
+ * Infomaniak Mail - Android
+ * Copyright (C) 2026 Infomaniak Network SA
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.infomaniak.mail.data.models.javascriptBridge
+
+import android.webkit.JavascriptInterface
+import com.infomaniak.core.sentry.SentryLog
+import org.json.JSONArray
+
+class EditorJavascriptBridge(
+    private val onImagesDeletedFromQuotes: (List<String>) -> Unit,
+) {
+    @JavascriptInterface
+    fun onImagesDeletedFromQuotes(cidJson: String) {
+        val jsonArray = runCatching {
+            JSONArray(cidJson)
+        }.onFailure {
+            SentryLog.e(TAG, "Failed to parse CIDs", it)
+        }.getOrNull() ?: return
+
+        val cids = (0 until jsonArray.length()).map { jsonArray.getString(it) }
+        onImagesDeletedFromQuotes(cids)
+    }
+
+    companion object {
+        private const val TAG = "EditorJavascriptBridge"
+    }
+}
diff --git a/app/src/main/java/com/infomaniak/mail/data/models/javascriptBridge/MessageDisplayJavascriptBridge.kt b/app/src/main/java/com/infomaniak/mail/data/models/javascriptBridge/MessageDisplayJavascriptBridge.kt
new file mode 100644
index 00000000000..897b681a585
--- /dev/null
+++ b/app/src/main/java/com/infomaniak/mail/data/models/javascriptBridge/MessageDisplayJavascriptBridge.kt
@@ -0,0 +1,59 @@
+/*
+ * Infomaniak Mail - Android
+ * Copyright (C) 2026 Infomaniak Network SA
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.infomaniak.mail.data.models.javascriptBridge
+
+import android.webkit.JavascriptInterface
+import com.infomaniak.mail.utils.SentryDebug
+
+class MessageDisplayJavascriptBridge(
+    private val onWebViewFinishedLoading: () -> Unit,
+) {
+
+    @JavascriptInterface
+    fun reportOverScroll(clientWidth: Int, scrollWidth: Int, messageUid: String) {
+        SentryDebug.sendOverScrolledMessage(clientWidth, scrollWidth, messageUid)
+    }
+
+    @JavascriptInterface
+    fun reportError(
+        errorName: String,
+        errorMessage: String,
+        errorStack: String,
+        scriptFirstLine: String,
+        messageUid: String,
+    ) {
+        val correctErrorStack = fixStackTraceLineNumber(errorStack, scriptFirstLine)
+        SentryDebug.sendJavaScriptError(errorName, errorMessage, correctErrorStack, messageUid)
+    }
+
+    @JavascriptInterface
+    fun webviewFinishedLoading() {
+        onWebViewFinishedLoading()
+    }
+
+    private fun fixStackTraceLineNumber(errorStack: String, scriptFirstLine: String): String {
+        var correctErrorStack = errorStack
+        val matches = "about:blank:([0-9]+):".toRegex().findAll(correctErrorStack)
+        matches.forEach { match ->
+            val lineNumber = match.groupValues[1]
+            val newLineNumber = lineNumber.toInt() - scriptFirstLine.toInt() + 1
+            correctErrorStack = correctErrorStack.replace(match.groupValues[0], "about:blank:$newLineNumber:")
+        }
+        return correctErrorStack
+    }
+}
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 8cae6387dd0..c49c6f8a77e 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -442,9 +442,7 @@ class NewMessageFragment : Fragment() {
     }
 
     private fun initEditorUi() = with(binding) {
-        editorWebView.initEditorWebviewBridge(onImagesDeletedFromQuotes = { cids ->
-            newMessageViewModel.deleteInlineAttachments(cids)
-        })
+        editorWebView.initEditorWebviewBridge(onImagesDeletedFromQuotes = newMessageViewModel::deleteInlineAttachments)
         editorWebView.subscribeToStates(setOf(BOLD, ITALIC, UNDERLINE, STRIKE_THROUGH, UNORDERED_LIST, CREATE_LINK))
         setEditorStyle()
         editorAiAnimation.setAnimation(R.raw.euria)
diff --git a/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
index f647a08c65a..94a3653dfc7 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
@@ -21,12 +21,12 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.view.MotionEvent
 import android.view.ViewParent
-import android.webkit.JavascriptInterface
 import android.webkit.WebSettings
 import android.webkit.WebSettings.LOAD_CACHE_ELSE_NETWORK
 import android.webkit.WebView
-import com.infomaniak.core.sentry.SentryLog
 import com.infomaniak.mail.R
+import com.infomaniak.mail.data.models.javascriptBridge.EditorJavascriptBridge
+import com.infomaniak.mail.data.models.javascriptBridge.MessageDisplayJavascriptBridge
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getCustomDarkMode
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getCustomStyle
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getFixStyleScript
@@ -37,7 +37,6 @@ import com.infomaniak.mail.utils.HtmlFormatter.Companion.getPrintMailStyle
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getResizeScript
 import com.infomaniak.mail.utils.extensions.enableAlgorithmicDarkening
 import com.infomaniak.mail.utils.extensions.loadCss
-import org.json.JSONArray
 import kotlin.math.abs
 
 class WebViewUtils(context: Context) {
@@ -83,75 +82,17 @@ class WebViewUtils(context: Context) {
         registerBreakLongWords()
     }
 
-    class EditorJavascriptBridge(
-        private val onImagesDeletedFromQuotes: ((List<String>) -> Unit)? = null,
-    ) {
-        @JavascriptInterface
-        fun onImagesDeletedFromQuotes(cidJson: String) {
-            runCatching {
-                val cids = JSONArray(cidJson)
-                    .let { jsonArray -> (0 until jsonArray.length()).map { jsonArray.getString(it) } }
-                onImagesDeletedFromQuotes?.invoke(cids)
-            }.onFailure {
-                SentryLog.e(TAG, "Failed to parse CIDs")
-            }
-        }
-    }
-
-    class JavascriptBridge(
-        private val onWebViewFinishedLoading: (() -> Unit)? = null,
-    ) {
-
-        @JavascriptInterface
-        fun reportOverScroll(clientWidth: Int, scrollWidth: Int, messageUid: String) {
-            SentryDebug.sendOverScrolledMessage(clientWidth, scrollWidth, messageUid)
-        }
-
-        @JavascriptInterface
-        fun reportError(
-            errorName: String,
-            errorMessage: String,
-            errorStack: String,
-            scriptFirstLine: String,
-            messageUid: String,
-        ) {
-            val correctErrorStack = fixStackTraceLineNumber(errorStack, scriptFirstLine)
-            SentryDebug.sendJavaScriptError(errorName, errorMessage, correctErrorStack, messageUid)
-        }
-
-        @JavascriptInterface
-        fun webviewFinishedLoading() {
-            onWebViewFinishedLoading?.invoke()
-        }
-
-        private fun fixStackTraceLineNumber(errorStack: String, scriptFirstLine: String): String {
-            var correctErrorStack = errorStack
-            val matches = "about:blank:([0-9]+):".toRegex().findAll(correctErrorStack)
-            matches.forEach { match ->
-                val lineNumber = match.groupValues[1]
-                val newLineNumber = lineNumber.toInt() - scriptFirstLine.toInt() + 1
-                correctErrorStack = correctErrorStack.replace(match.groupValues[0], "about:blank:$newLineNumber:")
-            }
-            return correctErrorStack
-        }
-    }
-
     companion object {
-        private const val TAG = "JavascriptBridge"
         private const val DARK_BACKGROUND_STYLE_ID = "dark_background_style"
 
-        lateinit var jsBridge: JavascriptBridge // TODO: Avoid excessive memory consumption with injection
+        lateinit var messageDisplayJsBridge: MessageDisplayJavascriptBridge // TODO: Avoid excessive memory consumption with injection
         lateinit var editorJsBridge: EditorJavascriptBridge
 
-        fun initJavascriptBridge(
-            onWebViewFinishedLoading: (() -> Unit)? = null,
-        ) {
-            jsBridge = JavascriptBridge(onWebViewFinishedLoading = onWebViewFinishedLoading)
+        fun initMessageDisplayJavascriptBridge(onWebViewFinishedLoading: () -> Unit) {
+            messageDisplayJsBridge = MessageDisplayJavascriptBridge(onWebViewFinishedLoading = onWebViewFinishedLoading)
         }
 
-        fun initEditorJsBridge(
-            onImagesDeletedFromQuotes: ((List<String>) -> Unit)? = null,
-        ) {
+        fun initEditorJsBridge(onImagesDeletedFromQuotes: (List<String>) -> Unit) {
             editorJsBridge = EditorJavascriptBridge(onImagesDeletedFromQuotes = onImagesDeletedFromQuotes)
         }
 
diff --git a/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt b/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt
index 1690294c545..3a0f6cfdf2d 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt
@@ -267,11 +267,11 @@ fun WebView.initDisplayWebViewClientAndBridge(
     onBlockedResourcesDetected: (() -> Unit)? = null,
     navigateToNewMessageActivity: ((Uri) -> Unit)?,
     onPageFinished: (() -> Unit)? = null,
-    onWebViewFinishedLoading: (() -> Unit)? = null,
+    onWebViewFinishedLoading: () -> Unit,
 ): MessageDisplayWebViewClient {
 
-    WebViewUtils.initJavascriptBridge(onWebViewFinishedLoading)
-    addJavascriptInterface(WebViewUtils.jsBridge, "kmail")
+    WebViewUtils.initMessageDisplayJavascriptBridge(onWebViewFinishedLoading)
+    addJavascriptInterface(WebViewUtils.messageDisplayJsBridge, "kmail")
 
     val cidDictionary = mutableMapOf<String, Attachment>().apply {
         attachments.forEach {
@@ -294,7 +294,7 @@ fun WebView.initDisplayWebViewClientAndBridge(
     }
 }
 
-fun WebView.initEditorWebviewBridge(onImagesDeletedFromQuotes: ((List<String>) -> Unit)? = null) {
+fun WebView.initEditorWebviewBridge(onImagesDeletedFromQuotes: (List<String>) -> Unit) {
     settings.setupNewMessageWebViewSettings()
     WebViewUtils.initEditorJsBridge(onImagesDeletedFromQuotes)
     addJavascriptInterface(WebViewUtils.editorJsBridge, "kmail")

From 728114799a7bb48a48a01766deef22fce98aedde Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Wed, 25 Mar 2026 13:51:31 +0100
Subject: [PATCH 46/94] fix: Clean webview client arguments and change inline
 images observer script

---
 .../EditorJavascriptBridge.kt                 |  6 +--
 .../mail/ui/main/thread/ThreadAdapter.kt      |  4 +-
 .../webViewClient/EditorWebViewClient.kt      | 10 +----
 .../MessageDisplayWebViewClient.kt            | 33 ++++++++++++---
 .../webViewClient/MessageWebViewClient.kt     | 31 --------------
 .../mail/ui/newMessage/NewMessageFragment.kt  | 15 ++++---
 .../mail/ui/newMessage/NewMessageViewModel.kt |  5 +--
 .../infomaniak/mail/utils/HtmlFormatter.kt    |  2 +-
 .../com/infomaniak/mail/utils/WebViewUtils.kt |  4 +-
 .../mail/utils/extensions/Extensions.kt       | 40 +++++++++----------
 ...r.js => deleted_inline_images_observer.js} | 22 +++-------
 .../main/res/raw/editor_javascript_bridge.js  |  4 +-
 12 files changed, 74 insertions(+), 102 deletions(-)
 rename app/src/main/res/raw/{quotes_images_observer.js => deleted_inline_images_observer.js} (72%)

diff --git a/app/src/main/java/com/infomaniak/mail/data/models/javascriptBridge/EditorJavascriptBridge.kt b/app/src/main/java/com/infomaniak/mail/data/models/javascriptBridge/EditorJavascriptBridge.kt
index bdd2f3c8f00..e570e4c67bf 100644
--- a/app/src/main/java/com/infomaniak/mail/data/models/javascriptBridge/EditorJavascriptBridge.kt
+++ b/app/src/main/java/com/infomaniak/mail/data/models/javascriptBridge/EditorJavascriptBridge.kt
@@ -22,10 +22,10 @@ import com.infomaniak.core.sentry.SentryLog
 import org.json.JSONArray
 
 class EditorJavascriptBridge(
-    private val onImagesDeletedFromQuotes: (List<String>) -> Unit,
+    private val onInlineImagesDeleted: (List<String>) -> Unit,
 ) {
     @JavascriptInterface
-    fun onImagesDeletedFromQuotes(cidJson: String) {
+    fun onInlineImagesDeleted(cidJson: String) {
         val jsonArray = runCatching {
             JSONArray(cidJson)
         }.onFailure {
@@ -33,7 +33,7 @@ class EditorJavascriptBridge(
         }.getOrNull() ?: return
 
         val cids = (0 until jsonArray.length()).map { jsonArray.getString(it) }
-        onImagesDeletedFromQuotes(cids)
+        onInlineImagesDeleted(cids)
     }
 
     companion object {
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadAdapter.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadAdapter.kt
index 9aeb8efe68c..982f6117405 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadAdapter.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadAdapter.kt
@@ -798,8 +798,8 @@ class ThreadAdapter(
         quoteButtonFrameLayout.isVisible = hasQuote
 
         initWebViewClientIfNeeded(
-            message,
-            threadAdapterCallbacks?.navigateToNewMessageActivity,
+            message = message,
+            navigateToNewMessageActivity = threadAdapterCallbacks?.navigateToNewMessageActivity,
             onPageFinished = { onExpandedMessageLoaded(message.uid) },
             onWebViewFinishedLoading = { threadAdapterCallbacks?.onBodyWebViewFinishedLoading?.invoke() },
         )
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/EditorWebViewClient.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/EditorWebViewClient.kt
index d6073140f39..bf097abc16d 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/EditorWebViewClient.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/EditorWebViewClient.kt
@@ -18,7 +18,6 @@
 package com.infomaniak.mail.ui.main.thread.webViewClient
 
 import android.content.Context
-import android.net.Uri
 import android.webkit.WebView
 import com.infomaniak.mail.data.models.Attachment
 
@@ -26,19 +25,14 @@ class EditorWebViewClient(
     context: Context,
     cidDictionary: MutableMap<String, Attachment>,
     shouldLoadDistantResources: Boolean,
-    onBlockedResourcesDetected: (() -> Unit)? = null,
-    navigateToNewMessageActivity: ((Uri) -> Unit)?,
-    onPageFinished: (() -> Unit)? = null,
+    private val onPageFinished: () -> Unit,
 ) : MessageWebViewClient(
     context,
     cidDictionary,
     shouldLoadDistantResources,
-    onBlockedResourcesDetected,
-    navigateToNewMessageActivity,
-    onPageFinished,
 ) {
     override fun onPageFinished(webView: WebView, url: String?) {
         webView.evaluateJavascript("removeAllProperties()", null)
-        super.onPageFinished(webView, url)
+        onPageFinished()
     }
 }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageDisplayWebViewClient.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageDisplayWebViewClient.kt
index 49a19f280d3..a2660cfd2b5 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageDisplayWebViewClient.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageDisplayWebViewClient.kt
@@ -18,10 +18,14 @@
 package com.infomaniak.mail.ui.main.thread.webViewClient
 
 import android.content.Context
+import android.content.Intent
 import android.net.Uri
+import android.webkit.WebResourceRequest
 import android.webkit.WebView
+import com.infomaniak.core.ui.showToast
 import com.infomaniak.core.ui.view.toDp
 import com.infomaniak.lib.richhtmleditor.looselyEscapeAsStringLiteralForJs
+import com.infomaniak.mail.R
 import com.infomaniak.mail.data.models.Attachment
 import com.infomaniak.mail.utils.Utils.runCatchingRealm
 import com.infomaniak.mail.utils.WebViewVersionUtils
@@ -33,17 +37,34 @@ class MessageDisplayWebViewClient(
     cidDictionary: MutableMap<String, Attachment>,
     private val messageUid: String,
     private var shouldLoadDistantResources: Boolean,
-    onBlockedResourcesDetected: (() -> Unit)? = null,
-    navigateToNewMessageActivity: ((Uri) -> Unit)?,
-    onPageFinished: (() -> Unit)? = null,
+    onBlockedResourcesDetected: () -> Unit,
+    private val navigateToNewMessageActivity: ((Uri) -> Unit)?,
+    private val onPageFinished: (() -> Unit)?,
 ) : MessageWebViewClient(
     context,
     cidDictionary,
     shouldLoadDistantResources,
     onBlockedResourcesDetected,
-    navigateToNewMessageActivity,
-    onPageFinished,
 ) {
+    override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean {
+        request.url?.let { uri ->
+
+            if (uri.scheme == "mailto") {
+                navigateToNewMessageActivity?.invoke(uri)
+                return true
+            }
+
+            runCatching {
+                val intent = Intent(Intent.ACTION_VIEW, uri)
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                context.startActivity(intent)
+            }.onFailure {
+                context.showToast(R.string.startActivityCantHandleAction)
+            }
+        }
+        return true
+    }
+
     override fun onPageFinished(webView: WebView, url: String?) {
         runCatchingRealm {
             val widthInDp = webView.width.toDp(webView)
@@ -67,7 +88,7 @@ class MessageDisplayWebViewClient(
             }
             val escapedMessageUid = looselyEscapeAsStringLiteralForJs(messageUid)
             webView.loadUrl("javascript:removeAllProperties(); normalizeMessageWidth($widthInDp, '$escapedMessageUid')")
-            super.onPageFinished(webView, url)
+            onPageFinished?.invoke()
         }
     }
 }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageWebViewClient.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageWebViewClient.kt
index 39138b435db..9b360ebc7bc 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageWebViewClient.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageWebViewClient.kt
@@ -18,14 +18,10 @@
 package com.infomaniak.mail.ui.main.thread.webViewClient
 
 import android.content.Context
-import android.content.Intent
-import android.net.Uri
 import android.webkit.WebResourceRequest
 import android.webkit.WebResourceResponse
 import android.webkit.WebView
 import android.webkit.WebViewClient
-import com.infomaniak.core.ui.showToast
-import com.infomaniak.mail.R
 import com.infomaniak.mail.data.api.ApiRepository
 import com.infomaniak.mail.data.models.Attachment
 import com.infomaniak.mail.utils.LocalStorageUtils
@@ -39,8 +35,6 @@ abstract class MessageWebViewClient(
     private val cidDictionary: MutableMap<String, Attachment>,
     private var shouldLoadDistantResources: Boolean,
     private val onBlockedResourcesDetected: (() -> Unit)? = null,
-    private val navigateToNewMessageActivity: ((Uri) -> Unit)?,
-    private val onPageFinished: (() -> Unit)? = null,
 ) : WebViewClient() {
 
     private val emptyResource by lazy { WebResourceResponse("text/plain", "utf-8", ByteArrayInputStream(ByteArray(0))) }
@@ -81,31 +75,6 @@ abstract class MessageWebViewClient(
         }
     }.getOrDefault(super.shouldInterceptRequest(view, request))
 
-    override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean {
-        request.url?.let { uri ->
-
-            if (uri.scheme == "mailto") {
-                navigateToNewMessageActivity?.invoke(uri)
-                return true
-            }
-
-            runCatching {
-                val intent = Intent(Intent.ACTION_VIEW, uri)
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                context.startActivity(intent)
-            }.onFailure {
-                context.showToast(R.string.startActivityCantHandleAction)
-            }
-        }
-        return true
-    }
-
-    override fun onPageFinished(webView: WebView, url: String?) {
-        runCatchingRealm {
-            onPageFinished?.invoke()
-        }
-    }
-
     fun unblockDistantResources() {
         shouldLoadDistantResources = true
     }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index c49c6f8a77e..766b0bd0335 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -92,9 +92,9 @@ import com.infomaniak.mail.utils.AccountUtils
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getCustomDarkMode
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getCustomEditorStyle
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getCustomStyle
+import com.infomaniak.mail.utils.HtmlFormatter.Companion.getDeletedInlineImagesObserverScript
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getEditorJsBridgeScript
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getHideQuotesStyle
-import com.infomaniak.mail.utils.HtmlFormatter.Companion.getQuotesImagesObserverScript
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getReplaceSignatureScript
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getShowQuotesScript
 import com.infomaniak.mail.utils.MessageBodyUtils
@@ -140,7 +140,7 @@ class NewMessageFragment : Fragment() {
     private val replaceSignatureScript by lazy { requireContext().getReplaceSignatureScript() }
     private val showQuotesScript by lazy { requireContext().getShowQuotesScript() }
     private val hideQuotesStyle by lazy { requireContext().getHideQuotesStyle() }
-    private val quoteImagesObserverScript by lazy { requireContext().getQuotesImagesObserverScript() }
+    private val deletedInlineImagesObserverScript by lazy { requireContext().getDeletedInlineImagesObserverScript() }
     private val editorJsBridgeScript by lazy { requireContext().getEditorJsBridgeScript() }
 
     private val newMessageFragmentArgs: NewMessageFragmentArgs by navArgs()
@@ -442,9 +442,10 @@ class NewMessageFragment : Fragment() {
     }
 
     private fun initEditorUi() = with(binding) {
-        editorWebView.initEditorWebviewBridge(onImagesDeletedFromQuotes = newMessageViewModel::deleteInlineAttachments)
+        editorWebView.initEditorWebviewBridge(onInlineImagesDeleted = newMessageViewModel::deleteInlineAttachments)
         editorWebView.subscribeToStates(setOf(BOLD, ITALIC, UNDERLINE, STRIKE_THROUGH, UNORDERED_LIST, CREATE_LINK))
         setEditorStyle()
+        setEditorScript()
         editorAiAnimation.setAnimation(R.raw.euria)
         setToolbarEnabledStatus(false)
         handleFocusChanges()
@@ -457,6 +458,11 @@ class NewMessageFragment : Fragment() {
         addCss(context.getCustomEditorStyle())
     }
 
+    private fun setEditorScript() = with(binding.editorWebView) {
+        addScript(editorJsBridgeScript)
+        evaluateJavascript(deletedInlineImagesObserverScript, null)
+    }
+
     private fun handleFocusChanges() = with(newMessageViewModel) {
         isEditorWebViewFocusedLiveData.observe(viewLifecycleOwner) { isFocused ->
             setToolbarEnabledStatus(isFocused)
@@ -499,12 +505,10 @@ class NewMessageFragment : Fragment() {
 
     private fun configureUiWithDraftData(draft: Draft) = with(binding.editorWebView) {
         settings.setupNewMessageWebViewSettings()
-        addScript(editorJsBridgeScript)
         val alwaysShowExternalContent = localSettings.externalContent == LocalSettings.ExternalContent.ALWAYS
         webViewClient = initEditorWebviewClient(
             attachments = draft.attachments,
             shouldLoadDistantResources = alwaysShowExternalContent || newMessageViewModel.shouldLoadDistantResources(),
-            navigateToNewMessageActivity = null,
             onPageFinished = { notifyPageHasLoaded() },
         )
     }
@@ -518,7 +522,6 @@ class NewMessageFragment : Fragment() {
                 if (!isQuotesButtonVisible) {
                     // User toggled show quotes visibility
                     binding.editorWebView.evaluateJavascript(showQuotesScript, null)
-                    binding.editorWebView.evaluateJavascript(quoteImagesObserverScript, null)
                 } else {
                     binding.editorWebView.addCss(hideQuotesStyle, "quote-visibility")
                 }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index c887eaa888f..3683b4b18b0 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -1096,9 +1096,8 @@ class NewMessageViewModel @Inject constructor(
 
     fun deleteInlineAttachments(cids: List<String>) {
         val cidsToDelete = cids.map { it.removePrefix("cid:") }
-        val newAttachments = attachmentsLiveData.value
-            ?.filter { attachment -> !cidsToDelete.contains(attachment.contentId) }
-            ?: emptyList()
+        val attachmentsData = attachmentsLiveData.value ?: return
+        val newAttachments = attachmentsData.filter { attachment -> !cidsToDelete.contains(attachment.contentId) }
         attachmentsLiveData.postValue(newAttachments)
     }
 
diff --git a/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt b/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
index 395cd2ad0ae..4db73330a26 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
@@ -237,7 +237,7 @@ class HtmlFormatter(private val html: String) {
 
         fun Context.getShowQuotesScript(): String = loadScript(R.raw.show_quotes_script)
 
-        fun Context.getQuotesImagesObserverScript(): String = loadScript(R.raw.quotes_images_observer)
+        fun Context.getDeletedInlineImagesObserverScript(): String = loadScript(R.raw.deleted_inline_images_observer)
 
         fun Context.getReplaceSignatureScript(): String = loadScript(R.raw.replace_signature_script)
 
diff --git a/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
index 94a3653dfc7..9228f52b238 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
@@ -92,8 +92,8 @@ class WebViewUtils(context: Context) {
             messageDisplayJsBridge = MessageDisplayJavascriptBridge(onWebViewFinishedLoading = onWebViewFinishedLoading)
         }
 
-        fun initEditorJsBridge(onImagesDeletedFromQuotes: (List<String>) -> Unit) {
-            editorJsBridge = EditorJavascriptBridge(onImagesDeletedFromQuotes = onImagesDeletedFromQuotes)
+        fun initEditorJsBridge(onInlineImagesDeleted: (List<String>) -> Unit) {
+            editorJsBridge = EditorJavascriptBridge(onInlineImagesDeleted = onInlineImagesDeleted)
         }
 
         private fun WebSettings.setupCommonWebViewSettings() {
diff --git a/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt b/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt
index 3a0f6cfdf2d..f2fe4126aa5 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt
@@ -259,12 +259,14 @@ fun LottieAnimationView.changePathColor(illuColors: IlluColors) {
         SimpleColorFilter(illuColors.color)
     }
 }
+//endregion
 
+//region WebViewClient
 fun WebView.initDisplayWebViewClientAndBridge(
     attachments: List<Attachment>,
     messageUid: String,
     shouldLoadDistantResources: Boolean,
-    onBlockedResourcesDetected: (() -> Unit)? = null,
+    onBlockedResourcesDetected: () -> Unit,
     navigateToNewMessageActivity: ((Uri) -> Unit)?,
     onPageFinished: (() -> Unit)? = null,
     onWebViewFinishedLoading: () -> Unit,
@@ -273,13 +275,7 @@ fun WebView.initDisplayWebViewClientAndBridge(
     WebViewUtils.initMessageDisplayJavascriptBridge(onWebViewFinishedLoading)
     addJavascriptInterface(WebViewUtils.messageDisplayJsBridge, "kmail")
 
-    val cidDictionary = mutableMapOf<String, Attachment>().apply {
-        attachments.forEach {
-            it.contentId?.let { cid ->
-                if (cid.isNotBlank()) this[cid] = it
-            }
-        }
-    }
+    val cidDictionary = attachments.toCidDictionary()
 
     return MessageDisplayWebViewClient(
         context,
@@ -294,38 +290,38 @@ fun WebView.initDisplayWebViewClientAndBridge(
     }
 }
 
-fun WebView.initEditorWebviewBridge(onImagesDeletedFromQuotes: (List<String>) -> Unit) {
+fun WebView.initEditorWebviewBridge(onInlineImagesDeleted: (List<String>) -> Unit) {
     settings.setupNewMessageWebViewSettings()
-    WebViewUtils.initEditorJsBridge(onImagesDeletedFromQuotes)
+    WebViewUtils.initEditorJsBridge(onInlineImagesDeleted)
     addJavascriptInterface(WebViewUtils.editorJsBridge, "kmail")
 }
 
 fun WebView.initEditorWebviewClient(
     attachments: List<Attachment>,
     shouldLoadDistantResources: Boolean,
-    onBlockedResourcesDetected: (() -> Unit)? = null,
-    navigateToNewMessageActivity: ((Uri) -> Unit)?,
-    onPageFinished: (() -> Unit)? = null,
+    onPageFinished: () -> Unit,
 ): EditorWebViewClient {
-    val cidDictionary = mutableMapOf<String, Attachment>().apply {
-        attachments.forEach {
-            it.contentId?.let { cid ->
-                if (cid.isNotBlank()) this[cid] = it
-            }
-        }
-    }
+    val cidDictionary = attachments.toCidDictionary()
 
     return EditorWebViewClient(
         context,
         cidDictionary,
         shouldLoadDistantResources,
-        onBlockedResourcesDetected,
-        navigateToNewMessageActivity,
         onPageFinished,
     ).also {
         webViewClient = it
     }
 }
+
+private fun List<Attachment>.toCidDictionary(): MutableMap<String, Attachment> {
+    return mutableMapOf<String, Attachment>().apply {
+        forEach<Attachment> {
+            it.contentId?.let { cid ->
+                if (cid.isNotBlank()) this[cid] = it
+            }
+        }
+    }
+}
 //endregion
 
 //region API
diff --git a/app/src/main/res/raw/quotes_images_observer.js b/app/src/main/res/raw/deleted_inline_images_observer.js
similarity index 72%
rename from app/src/main/res/raw/quotes_images_observer.js
rename to app/src/main/res/raw/deleted_inline_images_observer.js
index 7f4c41fcc67..dd3cb991f95 100644
--- a/app/src/main/res/raw/quotes_images_observer.js
+++ b/app/src/main/res/raw/deleted_inline_images_observer.js
@@ -18,12 +18,9 @@
 
 (function() {
     var mutationObserver;
-    var QUOTE_SELECTORS = '.ik_mail_quote, .forwardContentMessage';
 
     function setupObserver() {
-        // Find all quotes containers to observe
-        var quoteElements = document.querySelectorAll(QUOTE_SELECTORS);
-        if (quoteElements.length === 0) return ;
+        var rootElement = document;
 
         mutationObserver = new MutationObserver(function(mutationRecords) {
            var removedCids = [];
@@ -45,22 +42,15 @@
 
            // Notify if images were removed
            if (removedCids.length > 0) {
-               onImagesDeletedFromQuotes(JSON.stringify(removedCids));
+               onInlineImagesDeleted(JSON.stringify(removedCids));
            }
         });
 
-        // Observe quotes containers
-        quoteElements.forEach(function(quoteElement) {
-           mutationObserver.observe(quoteElement, {
-              childList: true,
-              subtree: true,
-           })
+        mutationObserver.observe(rootElement, {
+          childList: true,
+          subtree: true,
         })
     }
 
-    if (document.readyState === 'loading') {
-        document.addEventListener('DOMContentLoaded', setupObserver);
-    } else {
-        setupObserver();
-    }
+    setupObserver();
 })();
diff --git a/app/src/main/res/raw/editor_javascript_bridge.js b/app/src/main/res/raw/editor_javascript_bridge.js
index d4a4017c81e..5626ee7b589 100644
--- a/app/src/main/res/raw/editor_javascript_bridge.js
+++ b/app/src/main/res/raw/editor_javascript_bridge.js
@@ -15,6 +15,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
- function onImagesDeletedFromQuotes(cids) {
-     globalThis.kmail.onImagesDeletedFromQuotes(cids);
+ function onInlineImagesDeleted(cids) {
+     globalThis.kmail.onInlineImagesDeleted(cids);
  }

From e928f8ba9e5d0a7739e2e3bca8a5ec89bfdbbd00 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Wed, 25 Mar 2026 14:19:24 +0100
Subject: [PATCH 47/94] fix: Empty body sanitization, return kdoc and combine
 flows for quotes button visibility

---
 .../mail/ui/newMessage/BodyContentPayload.kt  |  2 +-
 .../ui/newMessage/EditorContentManager.kt     |  2 +-
 .../mail/ui/newMessage/NewMessageFragment.kt  | 27 +++++++++++--------
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt
index 618f5d2b14f..595213a5402 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt
@@ -28,7 +28,7 @@ data class BodyContentPayload(val content: String, val type: BodyContentType) {
         fun emptyBody() =
             BodyContentPayload(
                 content = "<br><br>",
-                type = BodyContentType.HTML_UNSANITIZED
+                type = BodyContentType.HTML_SANITIZED
             )
     }
 }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorContentManager.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorContentManager.kt
index 362a59d178b..41752139be7 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorContentManager.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorContentManager.kt
@@ -29,7 +29,7 @@ import javax.inject.Inject
 class EditorContentManager @Inject constructor() {
 
     /**
-     * Returns the html that was processed and inserted inside the editor
+     * @return The html that was processed and inserted inside the editor
      * */
     fun setContent(editor: RichHtmlEditorWebView, bodyContentPayload: BodyContentPayload): String = with(editor) {
         return when (bodyContentPayload.type) {
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 766b0bd0335..fb109e84e8c 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -122,6 +122,8 @@ import dagger.hilt.android.AndroidEntryPoint
 import io.sentry.Sentry
 import io.sentry.SentryLevel
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.filterNot
 import kotlinx.coroutines.launch
 import splitties.experimental.ExperimentalSplittiesApi
 import java.util.Date
@@ -514,17 +516,20 @@ class NewMessageFragment : Fragment() {
     }
 
     private fun observeQuotesVisibility() = viewLifecycleOwner.lifecycleScope.launch {
-        newMessageViewModel.isQuotesButtonVisible.collect { isQuotesButtonVisible ->
-            binding.quotesToggleButton.isVisible = isQuotesButtonVisible
-
-            // We wait until the webview finished shimmering before changing the quotes' visibility.
-            if (!newMessageViewModel.isShimmering.value) {
-                if (!isQuotesButtonVisible) {
-                    // User toggled show quotes visibility
-                    binding.editorWebView.evaluateJavascript(showQuotesScript, null)
-                } else {
-                    binding.editorWebView.addCss(hideQuotesStyle, "quote-visibility")
-                }
+        combine(
+            newMessageViewModel.isQuotesButtonVisible,
+            newMessageViewModel.isShimmering.filterNot { it }
+        ) { isQuoteVisible, _ ->
+            isQuoteVisible
+        }.collect { isQuoteToggleButtonVisible ->
+            binding.quotesToggleButton.isVisible = isQuoteToggleButtonVisible
+
+            if (isQuoteToggleButtonVisible) {
+                // If the button is visible, quotes are hidden.
+                binding.editorWebView.addCss(hideQuotesStyle, "quote-visibility")
+            } else {
+                // User toggled show quotes visibility
+                binding.editorWebView.evaluateJavascript(showQuotesScript, null)
             }
         }
     }

From 3605976999dcdcedbbc29c5e56173d7604762400 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Wed, 25 Mar 2026 14:27:06 +0100
Subject: [PATCH 48/94] fix: Initialize webview client settings as soon as
 possible

---
 .../com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt | 6 +++---
 .../java/com/infomaniak/mail/utils/extensions/Extensions.kt | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index fb109e84e8c..9b2f555ad27 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -444,6 +444,7 @@ class NewMessageFragment : Fragment() {
     }
 
     private fun initEditorUi() = with(binding) {
+        editorWebView.settings.setupNewMessageWebViewSettings()
         editorWebView.initEditorWebviewBridge(onInlineImagesDeleted = newMessageViewModel::deleteInlineAttachments)
         editorWebView.subscribeToStates(setOf(BOLD, ITALIC, UNDERLINE, STRIKE_THROUGH, UNORDERED_LIST, CREATE_LINK))
         setEditorStyle()
@@ -506,7 +507,6 @@ class NewMessageFragment : Fragment() {
     }
 
     private fun configureUiWithDraftData(draft: Draft) = with(binding.editorWebView) {
-        settings.setupNewMessageWebViewSettings()
         val alwaysShowExternalContent = localSettings.externalContent == LocalSettings.ExternalContent.ALWAYS
         webViewClient = initEditorWebviewClient(
             attachments = draft.attachments,
@@ -540,8 +540,8 @@ class NewMessageFragment : Fragment() {
         }
     }
 
-    private fun setupToggleQuotesButton() = with(binding) {
-        quotesToggleButton.setOnClickListener {
+    private fun setupToggleQuotesButton() {
+        binding.quotesToggleButton.setOnClickListener {
             newMessageViewModel.changeQuotesButtonVisibility(isVisible = false)
         }
     }
diff --git a/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt b/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt
index f2fe4126aa5..441463b00fc 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt
@@ -117,7 +117,6 @@ import com.infomaniak.mail.utils.Utils
 import com.infomaniak.mail.utils.Utils.TAG_SEPARATOR
 import com.infomaniak.mail.utils.Utils.kSyncAccountUri
 import com.infomaniak.mail.utils.WebViewUtils
-import com.infomaniak.mail.utils.WebViewUtils.Companion.setupNewMessageWebViewSettings
 import io.realm.kotlin.query.RealmQuery
 import io.realm.kotlin.query.Sort
 import io.realm.kotlin.types.RealmInstant
@@ -291,7 +290,6 @@ fun WebView.initDisplayWebViewClientAndBridge(
 }
 
 fun WebView.initEditorWebviewBridge(onInlineImagesDeleted: (List<String>) -> Unit) {
-    settings.setupNewMessageWebViewSettings()
     WebViewUtils.initEditorJsBridge(onInlineImagesDeleted)
     addJavascriptInterface(WebViewUtils.editorJsBridge, "kmail")
 }

From 97c17d4520ed15304430162c15f6b4733983ff45 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Wed, 25 Mar 2026 16:15:57 +0100
Subject: [PATCH 49/94] fix: Add signature ID used for replacing signature

---
 .../mail/ui/newMessage/NewMessageFragment.kt     |  2 +-
 .../mail/ui/newMessage/NewMessageViewModel.kt    | 16 +++++++++++-----
 .../infomaniak/mail/utils/MessageBodyUtils.kt    |  2 ++
 .../com/infomaniak/mail/utils/SignatureUtils.kt  |  3 ++-
 app/src/main/res/raw/replace_signature_script.js |  2 +-
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 9b2f555ad27..24e476d73eb 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -589,7 +589,7 @@ class NewMessageFragment : Fragment() {
         val escapedSignature = looselyEscapeAsStringLiteralForJs(signatureWithClass)
 
         val replaceSignatureScript = replaceSignatureScript.format(
-            MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_CLASS_NAME,
+            MessageBodyUtils.EDITOR_LOCAL_SIGNATURE_ID,
             escapedSignature,
             MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME
         )
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index 3683b4b18b0..fb102d28f5c 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -949,7 +949,6 @@ class NewMessageViewModel @Inject constructor(
         )
 
         subject = subjectValue
-        body = removeEmptyQuotes(uiBodyValue)
 
         /**
          * If we are opening for the 1st time an existing Draft created somewhere else
@@ -965,23 +964,30 @@ class NewMessageViewModel @Inject constructor(
 
         // Only if `!isFinishing`, because if we are finishing, well… We're out of here so we don't care about all of that.
         if (!isFinishing) {
-            copyFromRealm().saveSnapshot(body)
+            copyFromRealm().saveSnapshot(uiBodyValue)
             isNewMessage = false
         }
+
+        body = removeUnwantedHtml(uiBodyValue)
     }
 
-    private fun removeEmptyQuotes(html: String): String {
+    /**
+     * We filter out some HTML elements that we don't want to send with the email.
+     */
+    private fun removeUnwantedHtml(html: String): String {
         val doc = jsoupParseWithLog(html)
 
+        // Remove id used for replacing signature.
+        doc.getElementById(MessageBodyUtils.EDITOR_LOCAL_SIGNATURE_ID)?.removeAttr("id")
+
         // If the user deleted the quotes' text, remove the quotes' div so user doesn't write in it
         // (the text could get hidden later with the toggle button).
         if (bodyHasEmptyQuotes(html)) {
             doc.getElementsByClass(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME).forEach { it.remove() }
             doc.getElementsByClass(MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME).forEach { it.remove() }
-            return doc.html()
         }
 
-        return html
+        return doc.html()
     }
 
     private fun bodyHasEmptyQuotes(body: String): Boolean {
diff --git a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
index e68d3da2bea..ab3402a230f 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
@@ -37,6 +37,8 @@ object MessageBodyUtils {
     const val INFOMANIAK_SIGNATURE_HTML_CLASS_NAME = "editorUserSignature"
     const val INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME = "ik_mail_quote"
     const val INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME = "forwardContentMessage"
+    // This ID is used for finding the signature to replace it. REMOVE before sending the email.
+    const val EDITOR_LOCAL_SIGNATURE_ID = "ikEditorLocalSignature"
 
     private const val QUOTE_DETECTION_TIMEOUT = 1_500L
 
diff --git a/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt
index c788a9605a4..941a36261b9 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt
@@ -17,6 +17,7 @@
  */
 package com.infomaniak.mail.utils
 
+import com.infomaniak.mail.utils.MessageBodyUtils.EDITOR_LOCAL_SIGNATURE_ID
 import com.infomaniak.mail.utils.MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_CLASS_NAME
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -25,7 +26,7 @@ import javax.inject.Singleton
 class SignatureUtils @Inject constructor() {
     fun encapsulateSignatureContentWithInfomaniakClass(signatureContent: String): String {
         return """
-            <div class="$INFOMANIAK_SIGNATURE_HTML_CLASS_NAME">
+            <div id="$EDITOR_LOCAL_SIGNATURE_ID" class="$INFOMANIAK_SIGNATURE_HTML_CLASS_NAME">
             $signatureContent
             </div>
         """.trimIndent()
diff --git a/app/src/main/res/raw/replace_signature_script.js b/app/src/main/res/raw/replace_signature_script.js
index a9e61880a17..1d4985cbb66 100644
--- a/app/src/main/res/raw/replace_signature_script.js
+++ b/app/src/main/res/raw/replace_signature_script.js
@@ -17,7 +17,7 @@
  */
 
 (function() {
-    const signatureElement = document.querySelector('.%s');
+    const signatureElement = document.getElementById('%s');
     const newSigHtml = %s;
     if (signatureElement) {
         if (newSigHtml === "") {

From 771c02c4245ed6a0818b2e1217b0bccacce08e2d Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Wed, 25 Mar 2026 16:16:25 +0100
Subject: [PATCH 50/94] fix: Fix snapshots that contain carriage returns

---
 .../infomaniak/mail/ui/newMessage/NewMessageViewModel.kt    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index fb102d28f5c..f8b88d3ccda 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -499,13 +499,17 @@ class NewMessageViewModel @Inject constructor(
             cc = cc.toSet(),
             bcc = bcc.toSet(),
             subject = subject,
-            uiBody = uiBodyValue,
+            uiBody = uiBodyValue.normalizeCarriageReturns(),
             isEncrypted = isEncrypted,
             encryptionPassword = encryptionKey ?: "",
             attachmentsLocalUuids = attachments.mapTo(mutableSetOf()) { it.localUuid },
         )
     }
 
+    private fun String.normalizeCarriageReturns(): String {
+        return replace("\r\n", "\n")
+    }
+
     fun saveInitialSnapshot(body: String) = viewModelScope.launch(ioCoroutineContext) {
         val draft: Draft? = getLatestLocalDraft(draftLocalUuid)
         draft?.saveSnapshot(body)

From 966951614bda803a40414ba6f71fb42a855a00b4 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Wed, 25 Mar 2026 16:36:23 +0100
Subject: [PATCH 51/94] fix: Use correct draft instance when saving snapshot

---
 .../mail/ui/newMessage/EditorBodyData.kt      | 27 +++++++++++++++++++
 .../mail/ui/newMessage/NewMessageFragment.kt  | 11 +++++---
 .../mail/ui/newMessage/NewMessageViewModel.kt | 11 +++-----
 3 files changed, 38 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorBodyData.kt

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorBodyData.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorBodyData.kt
new file mode 100644
index 00000000000..f759d5577ff
--- /dev/null
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorBodyData.kt
@@ -0,0 +1,27 @@
+/*
+ * Infomaniak Mail - Android
+ * Copyright (C) 2026 Infomaniak Network SA
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.infomaniak.mail.ui.newMessage
+
+import com.infomaniak.mail.data.models.draft.Draft
+
+sealed interface EditorBodyData {
+    val bodyContentPayload: BodyContentPayload
+
+    data class Initial(override val bodyContentPayload: BodyContentPayload, val draft: Draft) : EditorBodyData
+    data class Reload(override val bodyContentPayload: BodyContentPayload) : EditorBodyData
+}
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 24e476d73eb..81cb48dfd77 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -361,7 +361,7 @@ class NewMessageFragment : Fragment() {
         // This block of code is needed in order to keep and reload the content of the editor across configuration changes.
         binding.editorWebView.exportHtml { html ->
             newMessageViewModel.editorBodyInitializer.postValue(
-                NewMessageViewModel.EditorBodyInitialization(
+                EditorBodyData.Reload(
                     BodyContentPayload(html, BodyContentType.HTML_SANITIZED)
                 )
             )
@@ -721,9 +721,12 @@ class NewMessageFragment : Fragment() {
     }
 
     private fun observeBodyLoader() = with(newMessageViewModel) {
-        editorBodyInitializer.observe(viewLifecycleOwner) { (body, isFirstInitialization) ->
-            val bodyContent = editorContentManager.setContent(binding.editorWebView, body)
-            if (isFirstInitialization) saveInitialSnapshot(bodyContent)
+        editorBodyInitializer.observe(viewLifecycleOwner) { bodyContentData ->
+            val bodyContent = editorContentManager.setContent(binding.editorWebView, bodyContentData.bodyContentPayload)
+            if (bodyContentData is EditorBodyData.Initial) saveInitialSnapshot(
+                bodyContent,
+                bodyContentData.draft
+            )
             setupToggleQuotesButton()
         }
     }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index f8b88d3ccda..2a84cb0a7dc 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -173,9 +173,7 @@ class NewMessageViewModel @Inject constructor(
     inline val allRecipients get() = toLiveData.valueOrEmpty() + ccLiveData.valueOrEmpty() + bccLiveData.valueOrEmpty()
     //endregion
 
-    data class EditorBodyInitialization(val bodyContentPayload: BodyContentPayload, val isFirstInitialization: Boolean = false)
-
-    val editorBodyInitializer = SingleLiveEvent<EditorBodyInitialization>()
+    val editorBodyInitializer = SingleLiveEvent<EditorBodyData>()
 
     // 1. Navigating to AiPropositionFragment causes NewMessageFragment to export its body to `subjectAndBodyChannel`.
     // 2. Inserting the AI proposition navigates back to NewMessageFragment.
@@ -510,9 +508,8 @@ class NewMessageViewModel @Inject constructor(
         return replace("\r\n", "\n")
     }
 
-    fun saveInitialSnapshot(body: String) = viewModelScope.launch(ioCoroutineContext) {
-        val draft: Draft? = getLatestLocalDraft(draftLocalUuid)
-        draft?.saveSnapshot(body)
+    fun saveInitialSnapshot(body: String, draft: Draft) = viewModelScope.launch(ioCoroutineContext) {
+        draft.saveSnapshot(body)
     }
 
     private suspend fun Draft.initLiveData(signatures: List<Signature>) {
@@ -533,7 +530,7 @@ class NewMessageViewModel @Inject constructor(
 
         attachmentsLiveData.postValue(attachments)
 
-        editorBodyInitializer.postValue(EditorBodyInitialization(initialBody, isFirstInitialization = true))
+        editorBodyInitializer.postValue(EditorBodyData.Initial(bodyContentPayload = initialBody, draft = this))
 
         if (cc.isNotEmpty() || bcc.isNotEmpty()) {
             otherRecipientsFieldsAreEmpty.postValue(false)

From 2126294a3f797da4a7678d27c6b8c1b3cedfdab4 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Thu, 26 Mar 2026 09:03:01 +0100
Subject: [PATCH 52/94] fix: Make delete inline images script check the whole
 body

---
 .../mail/ui/newMessage/NewMessageFragment.kt  |  2 +-
 .../res/raw/deleted_inline_images_observer.js | 26 ++++++++++++-------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 81cb48dfd77..5ed6f443791 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -463,7 +463,7 @@ class NewMessageFragment : Fragment() {
 
     private fun setEditorScript() = with(binding.editorWebView) {
         addScript(editorJsBridgeScript)
-        evaluateJavascript(deletedInlineImagesObserverScript, null)
+        addScript(deletedInlineImagesObserverScript)
     }
 
     private fun handleFocusChanges() = with(newMessageViewModel) {
diff --git a/app/src/main/res/raw/deleted_inline_images_observer.js b/app/src/main/res/raw/deleted_inline_images_observer.js
index dd3cb991f95..95d8ccca86b 100644
--- a/app/src/main/res/raw/deleted_inline_images_observer.js
+++ b/app/src/main/res/raw/deleted_inline_images_observer.js
@@ -20,22 +20,17 @@
     var mutationObserver;
 
     function setupObserver() {
-        var rootElement = document;
+        var rootElement = document.body;
+        if (!rootElement) return;
 
         mutationObserver = new MutationObserver(function(mutationRecords) {
            var removedCids = [];
 
            mutationRecords.forEach(function (mutation) {
-             for (var removedNode, nodeIndex = 0; removedNode = mutation.removedNodes[nodeIndex]; ++nodeIndex) {
+             for (var nodeIndex = 0; nodeIndex < mutation.removedNodes.length; ++nodeIndex) {
+                var removedNode = mutation.removedNodes[nodeIndex]
                 if (removedNode.nodeType == Node.ELEMENT_NODE) {
-                   if ("img" == removedNode.tagName.toLowerCase()) {
-                       removedCids.push(removedNode.src);
-                   } else {
-                       var childImages = removedNode.getElementsByTagName("img");
-                       for (var childIndex = 0; childIndex < childImages.length; childIndex++) {
-                        removedCids.push(childImages[childIndex].src);
-                       }
-                   }
+                   addRemovedCids(removedNode, removedCids)
                 }
              }
            });
@@ -52,5 +47,16 @@
         })
     }
 
+    function addRemovedCids(removedNode, removedCids) {
+        if ("img" == removedNode.tagName.toLowerCase()) {
+            removedCids.push(removedNode.src);
+        } else {
+            var childImages = removedNode.getElementsByTagName("img");
+            for (var childIndex = 0; childIndex < childImages.length; childIndex++) {
+                removedCids.push(childImages[childIndex].src);
+            }
+        }
+    }
+
     setupObserver();
 })();

From 717074c7c72831e1516722780355c619c1cd29b7 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Thu, 26 Mar 2026 09:28:39 +0100
Subject: [PATCH 53/94] fix: Signature replacement related to empty signature

---
 .../mail/ui/newMessage/NewMessageFragment.kt  | 19 +++++++++++++------
 .../main/res/raw/replace_signature_script.js  |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 5ed6f443791..4b7e22d28e7 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -98,6 +98,9 @@ import com.infomaniak.mail.utils.HtmlFormatter.Companion.getHideQuotesStyle
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getReplaceSignatureScript
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getShowQuotesScript
 import com.infomaniak.mail.utils.MessageBodyUtils
+import com.infomaniak.mail.utils.MessageBodyUtils.EDITOR_LOCAL_SIGNATURE_ID
+import com.infomaniak.mail.utils.MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME
+import com.infomaniak.mail.utils.MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME
 import com.infomaniak.mail.utils.SentryDebug
 import com.infomaniak.mail.utils.SignatureUtils
 import com.infomaniak.mail.utils.WebViewUtils.Companion.setupNewMessageWebViewSettings
@@ -584,14 +587,18 @@ class NewMessageFragment : Fragment() {
     }
 
     private fun updateBodySignature(signature: Signature) {
-        val selectedSignature = if (signature.isDummy) "" else signature.content
-        val signatureWithClass = signatureUtils.encapsulateSignatureContentWithInfomaniakClass(selectedSignature)
-        val escapedSignature = looselyEscapeAsStringLiteralForJs(signatureWithClass)
+        val selectedSignature = if (signature.isDummy) {
+            "''" // This will represent an empty string in js.
+        } else {
+            val signatureWithClass = signatureUtils.encapsulateSignatureContentWithInfomaniakClass(signature.content)
+            looselyEscapeAsStringLiteralForJs(signatureWithClass)
+        }
 
+        val quotesSelector = ".${INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME},.${INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME}"
         val replaceSignatureScript = replaceSignatureScript.format(
-            MessageBodyUtils.EDITOR_LOCAL_SIGNATURE_ID,
-            escapedSignature,
-            MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME
+            EDITOR_LOCAL_SIGNATURE_ID,
+            selectedSignature,
+            quotesSelector
         )
 
         binding.editorWebView.evaluateJavascript(replaceSignatureScript, null)
diff --git a/app/src/main/res/raw/replace_signature_script.js b/app/src/main/res/raw/replace_signature_script.js
index 1d4985cbb66..ba0dceaa778 100644
--- a/app/src/main/res/raw/replace_signature_script.js
+++ b/app/src/main/res/raw/replace_signature_script.js
@@ -26,7 +26,7 @@
             signatureElement.outerHTML = newSigHtml;
         }
     } else if (newSigHtml !== "") {
-        const quotes = document.querySelector('.%s');
+        const quotes = document.querySelector('%s');
         if (quotes) {
             quotes.insertAdjacentHTML('beforebegin', newSigHtml);
         } else {

From 3ae1335cc8d105179e29c7f8d6196ae56fc620f5 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Thu, 26 Mar 2026 09:33:02 +0100
Subject: [PATCH 54/94] refactor: Move setupToggleQuotesButton to initUi

---
 .../com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 4b7e22d28e7..bfc5e2b7c23 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -433,6 +433,7 @@ class NewMessageFragment : Fragment() {
         })
 
         initEditorUi()
+        setupToggleQuotesButton()
 
         viewLifecycleOwner.lifecycleScope.launch {
             val mailbox = newMessageViewModel.currentMailbox()
@@ -734,7 +735,6 @@ class NewMessageFragment : Fragment() {
                 bodyContent,
                 bodyContentData.draft
             )
-            setupToggleQuotesButton()
         }
     }
 

From 45dc06a764654b77b560b662f93174a2ef759897 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Thu, 26 Mar 2026 11:04:55 +0100
Subject: [PATCH 55/94] fix: Use initial body to check placeholder visibility
 and sanitize initial body when merging

---
 .../ui/newMessage/EditorContentManager.kt     | 102 +++++++++---------
 .../mail/ui/newMessage/NewMessageFragment.kt  |   8 +-
 .../mail/ui/newMessage/NewMessageViewModel.kt |  33 +++---
 .../infomaniak/mail/utils/MessageBodyUtils.kt |  24 +++--
 4 files changed, 87 insertions(+), 80 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorContentManager.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorContentManager.kt
index 41752139be7..42ccb1e6091 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorContentManager.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorContentManager.kt
@@ -31,60 +31,66 @@ class EditorContentManager @Inject constructor() {
     /**
      * @return The html that was processed and inserted inside the editor
      * */
-    fun setContent(editor: RichHtmlEditorWebView, bodyContentPayload: BodyContentPayload): String = with(editor) {
-        return when (bodyContentPayload.type) {
-            BodyContentType.HTML_SANITIZED -> setSanitizedHtml(bodyContentPayload.content)
-            BodyContentType.HTML_UNSANITIZED -> setUnsanitizedHtml(bodyContentPayload.content)
-            BodyContentType.TEXT_PLAIN_WITH_HTML -> setPlainTextAndInterpretHtml(bodyContentPayload.content)
-            BodyContentType.TEXT_PLAIN_WITHOUT_HTML -> setPlainTextAndEscapeHtml(bodyContentPayload.content)
-        }
+    fun setContent(editor: RichHtmlEditorWebView, bodyContentPayload: BodyContentPayload): String {
+        val sanitizedBody = bodyContentPayload.toSanitizedHtml()
+        editor.setHtml(sanitizedBody)
+        return sanitizedBody
     }
 
-    private fun RichHtmlEditorWebView.setSanitizedHtml(html: String): String {
-        setHtml(html)
-        return html
-    }
+    companion object {
+        private val NEW_LINES_REGEX = "(\\r\\n|\\n)".toRegex()
 
-    private fun RichHtmlEditorWebView.setUnsanitizedHtml(html: String) = setSanitizedHtml(html.sanitize())
+        fun BodyContentPayload.toSanitizedHtml(): String {
+            return when (type) {
+                BodyContentType.HTML_SANITIZED -> getSanitizedHtml(content)
+                BodyContentType.HTML_UNSANITIZED -> getUnsanitizedHtml(content)
+                BodyContentType.TEXT_PLAIN_WITH_HTML -> getPlainTextAndInterpretHtml(content)
+                BodyContentType.TEXT_PLAIN_WITHOUT_HTML -> getPlainTextAndEscapeHtml(content)
+            }
+        }
 
-    private fun RichHtmlEditorWebView.setPlainTextAndInterpretHtml(text: String): String {
-        return setSanitizedHtml(text.replaceNewLines().sanitize())
-    }
 
-    private fun RichHtmlEditorWebView.setPlainTextAndEscapeHtml(text: String): String {
-        return setSanitizedHtml(text.escapeHtmlCharacters().replaceNewLines())
-    }
+        private fun getSanitizedHtml(html: String): String {
+            return html
+        }
 
-    private fun String.escapeHtmlCharacters(): String = Html.escapeHtml(this)
-
-    private fun String.replaceNewLines(): String = replace(NEW_LINES_REGEX, "<br>")
-
-    private fun String.sanitize(): String = HtmlSanitizer.getInstance()
-        .sanitize(jsoupParseWithLog(this))
-        .apply { outputSettings().prettyPrint(false) }
-        .getHtmlWithoutDocumentWrapping()
-
-    // Jsoup wraps parsed html inside an <html> and <body> tag. This gives us a wrapped form of the html content. While the editor
-    // can handle this wrapped HTML without issues, it will also output the HTML in this wrapped form if given one as input.
-    // If the HTML received from the API is unwrapped, the sanitization process will wrap it, leading to failed comparisons due to
-    // this wrapping, during draft snapshot comparisons, even when the actual content hasn't changed.
-    // This method checks if the HTML is wrapped with an <html> tag containing exactly one empty <head> and one <body> tag.
-    // If this wrapping is detected, the method unwraps the HTML and returns only the content within the <body> tag.
-    private fun Document.getHtmlWithoutDocumentWrapping(): String {
-        val html = root().firstElementChild() ?: return html()
-        val nodeSize = html.childNodeSize()
-        val elements = html.children()
-
-        val canRemoveDocumentWrapping = nodeSize == 2
-                && elements.count() == 2
-                && elements[0].tagName().uppercase() == "HEAD"
-                && elements[0].childNodeSize() == 0
-                && elements[1].tagName().uppercase() == "BODY"
-
-        return if (canRemoveDocumentWrapping) body().html() else html()
-    }
+        private fun getUnsanitizedHtml(html: String) = getSanitizedHtml(html.sanitize())
 
-    companion object {
-        private val NEW_LINES_REGEX = "(\\r\\n|\\n)".toRegex()
+        private fun getPlainTextAndInterpretHtml(text: String): String {
+            return getSanitizedHtml(text.replaceNewLines().sanitize())
+        }
+
+        private fun getPlainTextAndEscapeHtml(text: String): String {
+            return getSanitizedHtml(text.escapeHtmlCharacters().replaceNewLines())
+        }
+
+        private fun String.escapeHtmlCharacters(): String = Html.escapeHtml(this)
+
+        private fun String.replaceNewLines(): String = replace(NEW_LINES_REGEX, "<br>")
+
+        private fun String.sanitize(): String = HtmlSanitizer.getInstance()
+            .sanitize(jsoupParseWithLog(this))
+            .apply { outputSettings().prettyPrint(false) }
+            .getHtmlWithoutDocumentWrapping()
+
+        // Jsoup wraps parsed html inside an <html> and <body> tag. This gives us a wrapped form of the html content. While the editor
+        // can handle this wrapped HTML without issues, it will also output the HTML in this wrapped form if given one as input.
+        // If the HTML received from the API is unwrapped, the sanitization process will wrap it, leading to failed comparisons due to
+        // this wrapping, during draft snapshot comparisons, even when the actual content hasn't changed.
+        // This method checks if the HTML is wrapped with an <html> tag containing exactly one empty <head> and one <body> tag.
+        // If this wrapping is detected, the method unwraps the HTML and returns only the content within the <body> tag.
+        private fun Document.getHtmlWithoutDocumentWrapping(): String {
+            val html = root().firstElementChild() ?: return html()
+            val nodeSize = html.childNodeSize()
+            val elements = html.children()
+
+            val canRemoveDocumentWrapping = nodeSize == 2
+                    && elements.count() == 2
+                    && elements[0].tagName().uppercase() == "HEAD"
+                    && elements[0].childNodeSize() == 0
+                    && elements[1].tagName().uppercase() == "BODY"
+
+            return if (canRemoveDocumentWrapping) body().html() else html()
+        }
     }
 }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index bfc5e2b7c23..c1e1bb8b47d 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -97,7 +97,6 @@ import com.infomaniak.mail.utils.HtmlFormatter.Companion.getEditorJsBridgeScript
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getHideQuotesStyle
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getReplaceSignatureScript
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getShowQuotesScript
-import com.infomaniak.mail.utils.MessageBodyUtils
 import com.infomaniak.mail.utils.MessageBodyUtils.EDITOR_LOCAL_SIGNATURE_ID
 import com.infomaniak.mail.utils.MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME
 import com.infomaniak.mail.utils.MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME
@@ -487,8 +486,6 @@ class NewMessageFragment : Fragment() {
         if (initResult.value == null) {
             initDraftAndViewModel(intent = requireActivity().intent).observe(viewLifecycleOwner) { draft ->
                 if (draft != null) {
-                    val isBodyEmpty = MessageBodyUtils.isBodyBlank(draft)
-                    changePlaceholderVisibility(isVisible = isBodyEmpty)
                     showKeyboardInCorrectView(isToFieldEmpty = draft.to.isEmpty())
                     binding.subjectTextField.setText(draft.subject)
                 } else {
@@ -731,10 +728,7 @@ class NewMessageFragment : Fragment() {
     private fun observeBodyLoader() = with(newMessageViewModel) {
         editorBodyInitializer.observe(viewLifecycleOwner) { bodyContentData ->
             val bodyContent = editorContentManager.setContent(binding.editorWebView, bodyContentData.bodyContentPayload)
-            if (bodyContentData is EditorBodyData.Initial) saveInitialSnapshot(
-                bodyContent,
-                bodyContentData.draft
-            )
+            if (bodyContentData is EditorBodyData.Initial) saveInitialSnapshot(bodyContent, bodyContentData.draft)
         }
     }
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index 2a84cb0a7dc..bb0939721bb 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -77,6 +77,7 @@ import com.infomaniak.mail.data.models.signature.Signature
 import com.infomaniak.mail.di.IoDispatcher
 import com.infomaniak.mail.di.MainDispatcher
 import com.infomaniak.mail.ui.main.SnackbarManager
+import com.infomaniak.mail.ui.newMessage.EditorContentManager.Companion.toSanitizedHtml
 import com.infomaniak.mail.ui.newMessage.NewMessageActivity.DraftSaveConfiguration
 import com.infomaniak.mail.ui.newMessage.NewMessageEditorManager.EditorAction
 import com.infomaniak.mail.ui.newMessage.NewMessageRecipientFieldsManager.FieldType
@@ -331,15 +332,22 @@ class NewMessageViewModel @Inject constructor(
             realm.write { DraftController.upsertDraftBlocking(it, realm = this) }
             it.initLiveData(signatures)
             _isShimmering.emit(false)
-            if (initialBody.hasQuotes()) {
-                changeQuotesButtonVisibility(isVisible = true)
-            }
+            initEditorElementsVisibility()
             initResult.postValue(InitResult(it, signatures))
         }
 
         emit(draft)
     }
 
+    private fun initEditorElementsVisibility() {
+        val isBodyEmpty = MessageBodyUtils.isBodyBlank(initialBody)
+        changePlaceholderVisibility(isVisible = isBodyEmpty)
+
+        if (initialBody.hasQuotes()) {
+            changeQuotesButtonVisibility(isVisible = true)
+        }
+    }
+
     private suspend fun getExistingDraft(localUuid: String?): Draft? {
         return getLocalOrRemoteDraft(localUuid)?.also { draft ->
             saveNavArgsToSavedState(draft.localUuid)
@@ -389,21 +397,16 @@ class NewMessageViewModel @Inject constructor(
 
         populateWithExternalMailDataIfNeeded(draft = this, intent)
 
-        val finalBodyContent = getFinalBodyContent(initialSignature, initialQuote)
-        initialBody = BodyContentPayload(finalBodyContent, BodyContentType.HTML_UNSANITIZED)
+        val mergedBodyContent = initialBody.mergeWithSignatureAndQuotes(initialSignature, initialQuote)
+        initialBody = BodyContentPayload(mergedBodyContent, BodyContentType.HTML_UNSANITIZED)
     }
 
-    private fun getFinalBodyContent(initialSignature: String?, initialQuote: String?): String {
-        var finalBodyContent = initialBody.content
-
-        if (!initialSignature.isNullOrEmpty()) {
-            finalBodyContent += initialSignature
-        }
-        if (!initialQuote.isNullOrEmpty()) {
-            finalBodyContent += initialQuote
-        }
+    private fun BodyContentPayload.mergeWithSignatureAndQuotes(initialSignature: String?, initialQuote: String?): String {
+        var body = toSanitizedHtml()
+        if (!initialSignature.isNullOrEmpty()) body += initialSignature
+        if (!initialQuote.isNullOrEmpty()) body += initialQuote
 
-        return finalBodyContent
+        return body
     }
 
     /**
diff --git a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
index ab3402a230f..514a2f0ac8d 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
@@ -18,10 +18,11 @@
 package com.infomaniak.mail.utils
 
 import android.content.Context
-import com.infomaniak.mail.data.models.draft.Draft
 import com.infomaniak.mail.data.models.message.Body
 import com.infomaniak.mail.data.models.message.Message
 import com.infomaniak.mail.data.models.message.SubBody
+import com.infomaniak.mail.ui.newMessage.BodyContentPayload
+import com.infomaniak.mail.ui.newMessage.BodyContentType
 import com.infomaniak.mail.utils.JsoupParserUtil.jsoupParseWithLog
 import com.infomaniak.mail.utils.JsoupParserUtil.measureAndLogMemoryUsage
 import com.infomaniak.mail.utils.PrintHeaderUtils.createPrintHeader
@@ -118,15 +119,18 @@ object MessageBodyUtils {
         return htmlDocument.outerHtml() to quotes
     }
 
-    fun isBodyBlank(draft: Draft): Boolean {
-        val remoteBody = draft.body
-        if (remoteBody.isBlank()) return true
-
-        return when (draft.mimeType) {
-            Utils.TEXT_PLAIN -> remoteBody
-            Utils.TEXT_HTML -> getBodyWithoutSignatureAndQuotesFromHtml(remoteBody)
-            else -> error("Cannot load an email which is not of type text/plain or text/html")
-        }.isBlank()
+    fun isBodyBlank(body: BodyContentPayload): Boolean {
+        if (body.content.isBlank()) return true
+
+        return when (body.type) {
+            BodyContentType.HTML_UNSANITIZED,
+            BodyContentType.HTML_SANITIZED -> getBodyWithoutSignatureAndQuotesFromHtml(body.content).isBlank()
+            // On these cases we should return body content, but we know it's not blank already.
+            // We don't split text plain with HTML because with this type it shouldn't have quotes or signature
+            // and it would require to transform it to HTML which is an expensive operation
+            BodyContentType.TEXT_PLAIN_WITHOUT_HTML,
+            BodyContentType.TEXT_PLAIN_WITH_HTML -> false
+        }
     }
 
     /**

From 70ff07119ef4b040aeb79475f54aa79ab790b487 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Thu, 26 Mar 2026 11:23:09 +0100
Subject: [PATCH 56/94] docs: Add comment on new line after quotes

---
 .../cache/mailboxContent/ReplyForwardFooterManager.kt     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ReplyForwardFooterManager.kt b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ReplyForwardFooterManager.kt
index 9ec222568ef..263410ac228 100644
--- a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ReplyForwardFooterManager.kt
+++ b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/ReplyForwardFooterManager.kt
@@ -125,6 +125,10 @@ class ReplyForwardFooterManager @Inject constructor(private val appContext: Cont
             addAndEscapeTextLine("")
 
             addAlreadyEscapedBody(previousFullBody)
+            // We insert an unstyled empty line immediately after the quoted block. This is necessary because deleting styled
+            // content often leaves behind empty containers with residual formatting (borders, backgrounds). This plain line acts
+            // as a "clean exit", when the user deletes the quotes up to this point, the editor drops the quotes' inline styles
+            // completely, allowing the entire block to be removed in one go.
             addAndEscapeTextLine("")
         }.outerHtml()
     }
@@ -137,6 +141,10 @@ class ReplyForwardFooterManager @Inject constructor(private val appContext: Cont
             addReplyBlockQuote {
                 addAlreadyEscapedBody(previousFullBody)
             }
+            // We insert an unstyled empty line immediately after the quoted block. This is necessary because deleting styled
+            // content often leaves behind empty containers with residual formatting (borders, backgrounds). This plain line acts
+            // as a "clean exit", when the user deletes the quotes up to this point, the editor drops the quotes' inline styles
+            // completely, allowing the entire block to be removed in one go.
             addAndEscapeTextLine("")
         }.outerHtml()
     }

From 706a2c26da6cb0b5ec9d8810a149e4fa4629f9dc Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Thu, 26 Mar 2026 12:46:29 +0100
Subject: [PATCH 57/94] refactor: Body has empty quotes should avoid multiple
 parsing

---
 .../mail/ui/newMessage/NewMessageViewModel.kt  | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index bb0939721bb..c254e62bce0 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -84,7 +84,6 @@ import com.infomaniak.mail.ui.newMessage.NewMessageRecipientFieldsManager.FieldT
 import com.infomaniak.mail.utils.AccountUtils
 import com.infomaniak.mail.utils.ContactUtils.arrangeMergedContacts
 import com.infomaniak.mail.utils.DraftInitManager
-import com.infomaniak.mail.utils.JsoupParserUtil
 import com.infomaniak.mail.utils.JsoupParserUtil.jsoupParseWithLog
 import com.infomaniak.mail.utils.LocalStorageUtils
 import com.infomaniak.mail.utils.MessageBodyUtils
@@ -133,6 +132,7 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.invoke
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.jsoup.nodes.Document
 import splitties.experimental.ExperimentalSplittiesApi
 import java.util.Date
 import javax.inject.Inject
@@ -986,20 +986,16 @@ class NewMessageViewModel @Inject constructor(
 
         // If the user deleted the quotes' text, remove the quotes' div so user doesn't write in it
         // (the text could get hidden later with the toggle button).
-        if (bodyHasEmptyQuotes(html)) {
-            doc.getElementsByClass(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME).forEach { it.remove() }
-            doc.getElementsByClass(MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME).forEach { it.remove() }
-        }
+        doc.removeEmptyElements(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME)
+        doc.removeEmptyElements(MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME)
 
         return doc.html()
     }
 
-    private fun bodyHasEmptyQuotes(body: String): Boolean {
-        val replyQuotes = JsoupParserUtil.jsoupParseBodyFragmentWithLog(body)
-            .getElementsByClass(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME)
-        val forwardQuotes = JsoupParserUtil.jsoupParseBodyFragmentWithLog(body)
-            .getElementsByClass(MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME)
-        return replyQuotes.isNotEmpty() && !replyQuotes.hasText() || forwardQuotes.isNotEmpty() && !forwardQuotes.hasText()
+    private fun Document.removeEmptyElements(className: String) {
+        val elements = getElementsByClass(className)
+        if (elements.isEmpty()) return
+        elements.forEach { if (it.text().isEmpty()) it.remove() }
     }
 
     private fun Draft.updateDraftAttachmentsWithLiveData(uiAttachments: List<Attachment>, step: String) {

From 33ce1d1828ef07ae808fe2705ffb91d2c15354f1 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Thu, 26 Mar 2026 13:10:40 +0100
Subject: [PATCH 58/94] fix: Extra padding on top of new message

---
 app/src/main/res/layout/fragment_new_message.xml | 1 -
 app/src/main/res/raw/editor_style.css            | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/fragment_new_message.xml b/app/src/main/res/layout/fragment_new_message.xml
index 81738f2a4d8..66208c23dc1 100644
--- a/app/src/main/res/layout/fragment_new_message.xml
+++ b/app/src/main/res/layout/fragment_new_message.xml
@@ -308,7 +308,6 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:layout_marginStart="@dimen/marginStandardMedium"
-                        android:layout_marginTop="@dimen/marginStandardMedium"
                         android:paddingBottom="@dimen/marginStandardMedium"
                         android:text="@string/newMessagePlaceholderTitle"
                         android:textColor="@color/tertiaryTextColor"
diff --git a/app/src/main/res/raw/editor_style.css b/app/src/main/res/raw/editor_style.css
index cb58fe15f1d..4bddbf33e08 100644
--- a/app/src/main/res/raw/editor_style.css
+++ b/app/src/main/res/raw/editor_style.css
@@ -9,5 +9,5 @@ body {
     /* To have the spacing scroll with the mail it needs to be padding and not margin. */
     overflow-x: auto !important;
     margin: 0;
-    padding: 16px;
+    padding: 0 16px 0;
 }

From d7eccbd2121debf957431d84f40492c0d44d8189 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Thu, 26 Mar 2026 13:58:29 +0100
Subject: [PATCH 59/94] fix: Fix adding signature outside of editor when
 replacing a dummy signature

---
 app/src/main/res/raw/replace_signature_script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/raw/replace_signature_script.js b/app/src/main/res/raw/replace_signature_script.js
index ba0dceaa778..98bfa522f26 100644
--- a/app/src/main/res/raw/replace_signature_script.js
+++ b/app/src/main/res/raw/replace_signature_script.js
@@ -30,7 +30,7 @@
         if (quotes) {
             quotes.insertAdjacentHTML('beforebegin', newSigHtml);
         } else {
-            document.body.insertAdjacentHTML('beforeend', newSigHtml);
+            getEditor().insertAdjacentHTML('beforeend', newSigHtml);
         }
     }
 })()

From 9556b858e83afd562bc32048c0beb22a0cecb6a9 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Fri, 27 Mar 2026 11:36:00 +0100
Subject: [PATCH 60/94] refactor: Correct methods' order in
 initDraftAndViewModel

---
 .../infomaniak/mail/ui/newMessage/NewMessageViewModel.kt | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index c254e62bce0..3931aa1216f 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -331,15 +331,18 @@ class NewMessageViewModel @Inject constructor(
 
             realm.write { DraftController.upsertDraftBlocking(it, realm = this) }
             it.initLiveData(signatures)
+
+            initEditorElementsVisibility(initialBody)
+            editorBodyInitializer.postValue(EditorBodyData.Initial(bodyContentPayload = initialBody, draft = it))
+
             _isShimmering.emit(false)
-            initEditorElementsVisibility()
             initResult.postValue(InitResult(it, signatures))
         }
 
         emit(draft)
     }
 
-    private fun initEditorElementsVisibility() {
+    private fun initEditorElementsVisibility(initialBody: BodyContentPayload) {
         val isBodyEmpty = MessageBodyUtils.isBodyBlank(initialBody)
         changePlaceholderVisibility(isVisible = isBodyEmpty)
 
@@ -533,8 +536,6 @@ class NewMessageViewModel @Inject constructor(
 
         attachmentsLiveData.postValue(attachments)
 
-        editorBodyInitializer.postValue(EditorBodyData.Initial(bodyContentPayload = initialBody, draft = this))
-
         if (cc.isNotEmpty() || bcc.isNotEmpty()) {
             otherRecipientsFieldsAreEmpty.postValue(false)
             initializeFieldsAsOpen.postValue(true)

From d196f5e648480ca46fd578309017e3c32a3507c1 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Fri, 27 Mar 2026 17:05:27 +0100
Subject: [PATCH 61/94] fix: Add quotes to webview only when the user toggles
 their visibility

---
 .../ui/newMessage/EditorContentManager.kt     |  6 +-
 .../mail/ui/newMessage/NewMessageFragment.kt  | 31 ++++-----
 .../mail/ui/newMessage/NewMessageViewModel.kt | 64 +++++++++++++------
 .../infomaniak/mail/utils/HtmlFormatter.kt    |  2 +-
 .../infomaniak/mail/utils/MessageBodyUtils.kt | 31 +++++++--
 .../infomaniak/mail/utils/SignatureUtils.kt   |  6 +-
 .../raw/include_quotes_script.js}             | 13 ++--
 app/src/main/res/raw/show_quotes_script.js    | 35 ----------
 8 files changed, 91 insertions(+), 97 deletions(-)
 rename app/src/main/{java/com/infomaniak/mail/ui/newMessage/EditorBodyData.kt => res/raw/include_quotes_script.js} (65%)
 delete mode 100644 app/src/main/res/raw/show_quotes_script.js

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorContentManager.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorContentManager.kt
index 42ccb1e6091..6f7e47193bc 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorContentManager.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorContentManager.kt
@@ -31,10 +31,8 @@ class EditorContentManager @Inject constructor() {
     /**
      * @return The html that was processed and inserted inside the editor
      * */
-    fun setContent(editor: RichHtmlEditorWebView, bodyContentPayload: BodyContentPayload): String {
-        val sanitizedBody = bodyContentPayload.toSanitizedHtml()
-        editor.setHtml(sanitizedBody)
-        return sanitizedBody
+    fun setContent(editor: RichHtmlEditorWebView, bodyContentPayload: BodyContentPayload) {
+        editor.setHtml(bodyContentPayload.toSanitizedHtml())
     }
 
     companion object {
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index c1e1bb8b47d..0874606ce6d 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -124,6 +124,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import io.sentry.Sentry
 import io.sentry.SentryLevel
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.channels.consumeEach
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.filterNot
 import kotlinx.coroutines.launch
@@ -232,7 +233,8 @@ class NewMessageFragment : Fragment() {
         observeBodyLoader()
         observeShimmering()
         observePlaceholderVisibility()
-        observeQuotesVisibility()
+        observeQuotesButtonVisibility()
+        observeQuotesInclusion()
 
         setupBackActionHandler()
 
@@ -363,9 +365,7 @@ class NewMessageFragment : Fragment() {
         // This block of code is needed in order to keep and reload the content of the editor across configuration changes.
         binding.editorWebView.exportHtml { html ->
             newMessageViewModel.editorBodyInitializer.postValue(
-                EditorBodyData.Reload(
-                    BodyContentPayload(html, BodyContentType.HTML_SANITIZED)
-                )
+                BodyContentPayload(html, BodyContentType.HTML_SANITIZED)
             )
         }
 
@@ -516,7 +516,7 @@ class NewMessageFragment : Fragment() {
         )
     }
 
-    private fun observeQuotesVisibility() = viewLifecycleOwner.lifecycleScope.launch {
+    private fun observeQuotesButtonVisibility() = viewLifecycleOwner.lifecycleScope.launch {
         combine(
             newMessageViewModel.isQuotesButtonVisible,
             newMessageViewModel.isShimmering.filterNot { it }
@@ -524,14 +524,6 @@ class NewMessageFragment : Fragment() {
             isQuoteVisible
         }.collect { isQuoteToggleButtonVisible ->
             binding.quotesToggleButton.isVisible = isQuoteToggleButtonVisible
-
-            if (isQuoteToggleButtonVisible) {
-                // If the button is visible, quotes are hidden.
-                binding.editorWebView.addCss(hideQuotesStyle, "quote-visibility")
-            } else {
-                // User toggled show quotes visibility
-                binding.editorWebView.evaluateJavascript(showQuotesScript, null)
-            }
         }
     }
 
@@ -541,12 +533,22 @@ class NewMessageFragment : Fragment() {
         }
     }
 
+    private fun observeQuotesInclusion() = viewLifecycleOwner.lifecycleScope.launch {
+        newMessageViewModel.quotesToIncludeChannel.consumeEach { quote ->
+            val escapedQuote = looselyEscapeAsStringLiteralForJs(quote)
+            val includeQuoteScript = showQuotesScript.format(escapedQuote)
+            binding.editorWebView.evaluateJavascript(includeQuoteScript, null)
+        }
+    }
+
     private fun setupToggleQuotesButton() {
         binding.quotesToggleButton.setOnClickListener {
             newMessageViewModel.changeQuotesButtonVisibility(isVisible = false)
+            newMessageViewModel.includeQuotes()
         }
     }
 
+
     private fun setupFromField(signatures: List<Signature>) = with(binding) {
 
         signatureAdapter.setList(signatures)
@@ -727,8 +729,7 @@ class NewMessageFragment : Fragment() {
 
     private fun observeBodyLoader() = with(newMessageViewModel) {
         editorBodyInitializer.observe(viewLifecycleOwner) { bodyContentData ->
-            val bodyContent = editorContentManager.setContent(binding.editorWebView, bodyContentData.bodyContentPayload)
-            if (bodyContentData is EditorBodyData.Initial) saveInitialSnapshot(bodyContent, bodyContentData.draft)
+            editorContentManager.setContent(binding.editorWebView, bodyContentData)
         }
     }
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index 3931aa1216f..07277900a33 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -87,6 +87,8 @@ import com.infomaniak.mail.utils.DraftInitManager
 import com.infomaniak.mail.utils.JsoupParserUtil.jsoupParseWithLog
 import com.infomaniak.mail.utils.LocalStorageUtils
 import com.infomaniak.mail.utils.MessageBodyUtils
+import com.infomaniak.mail.utils.MessageBodyUtils.splitQuoteFromBody
+import com.infomaniak.mail.utils.MessageBodyUtils.splitSignatureAndQuoteFromHtml
 import com.infomaniak.mail.utils.SentryDebug
 import com.infomaniak.mail.utils.SharedUtils
 import com.infomaniak.mail.utils.SignatureUtils
@@ -163,6 +165,7 @@ class NewMessageViewModel @Inject constructor(
 
     //region Initial data
     private var initialBody: BodyContentPayload = BodyContentPayload.emptyBody()
+    private var initialQuote: String? = null // is always sanitized and it's only set in initDraftAndViewModel
     //endregion
 
     //region UI data
@@ -174,7 +177,7 @@ class NewMessageViewModel @Inject constructor(
     inline val allRecipients get() = toLiveData.valueOrEmpty() + ccLiveData.valueOrEmpty() + bccLiveData.valueOrEmpty()
     //endregion
 
-    val editorBodyInitializer = SingleLiveEvent<EditorBodyData>()
+    val editorBodyInitializer = SingleLiveEvent<BodyContentPayload>()
 
     // 1. Navigating to AiPropositionFragment causes NewMessageFragment to export its body to `subjectAndBodyChannel`.
     // 2. Inserting the AI proposition navigates back to NewMessageFragment.
@@ -223,6 +226,10 @@ class NewMessageViewModel @Inject constructor(
     private val _isQuotesButtonVisible = MutableStateFlow(false)
     val isQuotesButtonVisible: StateFlow<Boolean> = _isQuotesButtonVisible.asStateFlow()
 
+    private var areQuotesIncluded = false
+    private val _quotesToIncludeChannel: Channel<String> = Channel(capacity = CONFLATED)
+    val quotesToIncludeChannel: ReceiveChannel<String> = _quotesToIncludeChannel
+
     private val _isPlaceHolderVisible = MutableStateFlow(false)
     val isPlaceHolderVisible: StateFlow<Boolean> = _isPlaceHolderVisible.asStateFlow()
 
@@ -332,8 +339,7 @@ class NewMessageViewModel @Inject constructor(
             realm.write { DraftController.upsertDraftBlocking(it, realm = this) }
             it.initLiveData(signatures)
 
-            initEditorElementsVisibility(initialBody)
-            editorBodyInitializer.postValue(EditorBodyData.Initial(bodyContentPayload = initialBody, draft = it))
+            commonBodyProcessing(it)
 
             _isShimmering.emit(false)
             initResult.postValue(InitResult(it, signatures))
@@ -342,11 +348,25 @@ class NewMessageViewModel @Inject constructor(
         emit(draft)
     }
 
+    private fun commonBodyProcessing(draft: Draft) {
+        val sanitizedBodyHtml = initialBody.toSanitizedHtml()
+        val sanitizedBodyHtmlWithoutQuotes = if (initialQuote != null) {
+            val (body, signature) = splitSignatureAndQuoteFromHtml(sanitizedBodyHtml)
+            body + signature
+        } else {
+            sanitizedBodyHtml
+        }
+        val sanitizedBodyWithoutQuotes = BodyContentPayload(sanitizedBodyHtmlWithoutQuotes, BodyContentType.HTML_SANITIZED)
+        draft.saveSnapshot(sanitizedBodyHtml)
+        initEditorElementsVisibility(sanitizedBodyWithoutQuotes)
+        editorBodyInitializer.postValue(sanitizedBodyWithoutQuotes)
+    }
+
     private fun initEditorElementsVisibility(initialBody: BodyContentPayload) {
         val isBodyEmpty = MessageBodyUtils.isBodyBlank(initialBody)
         changePlaceholderVisibility(isVisible = isBodyEmpty)
 
-        if (initialBody.hasQuotes()) {
+        if (initialQuote != null) {
             changeQuotesButtonVisibility(isVisible = true)
         }
     }
@@ -362,6 +382,9 @@ class NewMessageViewModel @Inject constructor(
             else
                 BodyContentType.HTML_UNSANITIZED
             initialBody = BodyContentPayload(draft.body, contentType)
+            initialQuote = splitQuoteFromBody(draft)?.let {
+                BodyContentPayload(it, BodyContentType.HTML_UNSANITIZED).toSanitizedHtml()
+            }
             return draft
         }
     }
@@ -373,7 +396,6 @@ class NewMessageViewModel @Inject constructor(
         initLocalValues(mimeType = ClipDescription.MIMETYPE_TEXT_HTML)
         saveNavArgsToSavedState(localUuid)
 
-        var initialQuote: String? = null
         when (draftMode) {
             DraftMode.NEW_MAIL -> recipient?.let { to = realmListOf(it) }
             DraftMode.REPLY, DraftMode.REPLY_ALL, DraftMode.FORWARD -> {
@@ -386,7 +408,9 @@ class NewMessageViewModel @Inject constructor(
                         if (hasFailedFetching) return@let
 
                         initializeReplyForwardDraftValues(draft = this, fullMessage)
-                        initialQuote = draftInitManager.createQuote(draftMode, fullMessage, attachments)
+                        initialQuote = draftInitManager.createQuote(draftMode, fullMessage, attachments)?.let {
+                            BodyContentPayload(it, BodyContentType.HTML_UNSANITIZED).toSanitizedHtml()
+                        }
                     }
             }
         }
@@ -514,10 +538,6 @@ class NewMessageViewModel @Inject constructor(
         return replace("\r\n", "\n")
     }
 
-    fun saveInitialSnapshot(body: String, draft: Draft) = viewModelScope.launch(ioCoroutineContext) {
-        draft.saveSnapshot(body)
-    }
-
     private suspend fun Draft.initLiveData(signatures: List<Signature>) {
         val draftSignature = signatures.singleOrNull { it.id == identityId?.toInt() }
 
@@ -544,18 +564,15 @@ class NewMessageViewModel @Inject constructor(
         isEncryptionActivated.postValue(isEncrypted)
     }
 
-    private fun BodyContentPayload.hasQuotes(): Boolean {
-        if (type == BodyContentType.TEXT_PLAIN_WITHOUT_HTML || type == BodyContentType.TEXT_PLAIN_WITH_HTML) return false
-
-        val doc = jsoupParseWithLog(content)
-        return doc.getElementsByClass(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME).isNotEmpty() ||
-                doc.getElementsByClass(MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME).isNotEmpty()
-    }
-
     fun changeQuotesButtonVisibility(isVisible: Boolean) {
         _isQuotesButtonVisible.value = isVisible
     }
 
+    fun includeQuotes() {
+        initialQuote?.let { _quotesToIncludeChannel.trySend(it) }
+        areQuotesIncluded = true
+    }
+
     fun changePlaceholderVisibility(isVisible: Boolean) {
         _isPlaceHolderVisible.value = isVisible
     }
@@ -896,18 +913,23 @@ class NewMessageViewModel @Inject constructor(
         }
     }
 
+    private fun String.addMissingQuotes(): String {
+        return if (areQuotesIncluded) this else this + initialQuote
+    }
+
     private suspend fun executeDraftAction(draftSaveConfiguration: DraftSaveConfiguration) = with(draftSaveConfiguration) {
         val localUuid = draftLocalUuid ?: return@with
         val subject = subjectValue.ifBlank { null }?.take(SUBJECT_MAX_LENGTH)
 
-        if (action == DraftAction.SAVE && isSnapshotTheSame(subject, uiBodyValue)) {
+        val bodyWithQuotes = uiBodyValue.addMissingQuotes()
+        if (action == DraftAction.SAVE && isSnapshotTheSame(subject, bodyWithQuotes)) {
             if (isFinishing && isNewMessage) removeDraftFromRealm(localUuid)
             return@with
         }
 
         val hasFailed = mailboxContentRealm().write {
             DraftController.getDraftBlocking(localUuid, realm = this)
-                ?.updateDraftBeforeSavingRemotely(action, isFinishing, subject, uiBodyValue, realm = this@write)
+                ?.updateDraftBeforeSavingRemotely(action, isFinishing, subject, bodyWithQuotes, realm = this@write)
                 ?: return@write true
             return@write false
         }
@@ -1144,7 +1166,7 @@ class NewMessageViewModel @Inject constructor(
 
     private data class SubjectAndBodyData(val subject: String, val body: String, val expirationId: Int)
 
-    data class BodyData(val body: BodyContentPayload, val signature: String?, val quote: String?)
+    data class BodyData(val body: String, val signature: String?, val quote: String?)
 
     companion object {
         private val TAG = NewMessageViewModel::class.java.simpleName
diff --git a/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt b/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
index 4db73330a26..9dde9c01843 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
@@ -235,7 +235,7 @@ class HtmlFormatter(private val html: String) {
 
         fun Context.getHideQuotesStyle(): String = loadCss(R.raw.hide_quotes_style)
 
-        fun Context.getShowQuotesScript(): String = loadScript(R.raw.show_quotes_script)
+        fun Context.getShowQuotesScript(): String = loadScript(R.raw.include_quotes_script)
 
         fun Context.getDeletedInlineImagesObserverScript(): String = loadScript(R.raw.deleted_inline_images_observer)
 
diff --git a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
index 514a2f0ac8d..60d09878a7b 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
@@ -18,11 +18,13 @@
 package com.infomaniak.mail.utils
 
 import android.content.Context
+import com.infomaniak.mail.data.models.draft.Draft
 import com.infomaniak.mail.data.models.message.Body
 import com.infomaniak.mail.data.models.message.Message
 import com.infomaniak.mail.data.models.message.SubBody
 import com.infomaniak.mail.ui.newMessage.BodyContentPayload
 import com.infomaniak.mail.ui.newMessage.BodyContentType
+import com.infomaniak.mail.ui.newMessage.NewMessageViewModel.BodyData
 import com.infomaniak.mail.utils.JsoupParserUtil.jsoupParseWithLog
 import com.infomaniak.mail.utils.JsoupParserUtil.measureAndLogMemoryUsage
 import com.infomaniak.mail.utils.PrintHeaderUtils.createPrintHeader
@@ -124,7 +126,7 @@ object MessageBodyUtils {
 
         return when (body.type) {
             BodyContentType.HTML_UNSANITIZED,
-            BodyContentType.HTML_SANITIZED -> getBodyWithoutSignatureAndQuotesFromHtml(body.content).isBlank()
+            BodyContentType.HTML_SANITIZED -> splitSignatureAndQuoteFromHtml(body.content).body.htmlToText().isBlank()
             // On these cases we should return body content, but we know it's not blank already.
             // We don't split text plain with HTML because with this type it shouldn't have quotes or signature
             // and it would require to transform it to HTML which is an expensive operation
@@ -133,16 +135,31 @@ object MessageBodyUtils {
         }
     }
 
+    fun splitQuoteFromBody(draft: Draft): String? {
+        val remoteBody = draft.body
+        if (remoteBody.isEmpty()) return null
+
+        return when (draft.mimeType) {
+            Utils.TEXT_PLAIN -> null
+            Utils.TEXT_HTML -> splitSignatureAndQuoteFromHtml(remoteBody).quote
+            else -> error("Cannot load an email which is not of type text/plain or text/html")
+        }
+    }
+
     /**
      * This only takes into account infomaniak's quotes and signatures.
      */
-    private fun getBodyWithoutSignatureAndQuotesFromHtml(draftBody: String): String {
+    fun splitSignatureAndQuoteFromHtml(draftBody: String): BodyData {
 
         fun Document.split(divClassName: String, defaultValue: String): Pair<String, String?> {
-            return getElementsByClass(divClassName).firstOrNull()?.let {
+            // We need to use select and not getElementByClass because getElementByClass adds a \n after every <br>.
+            // The function remove() also adds \n after each <br> of it.
+            // So we need to use select, save the second part of the split first, and then do remove, to save the correct value
+            // for the snapshot to compare.
+            return select(".$divClassName").firstOrNull()?.let {
+                val second = if (it.html().isBlank()) null else it.outerHtml()
                 it.remove()
                 val first = body().html()
-                val second = if (it.html().isBlank()) null else it.outerHtml()
                 first to second
             } ?: (defaultValue to null)
         }
@@ -154,17 +171,17 @@ object MessageBodyUtils {
 
         val doc = jsoupParseWithLog(draftBody).also { it.outputSettings().prettyPrint(false) }
 
-        val (bodyWithQuote) = doc.split(INFOMANIAK_SIGNATURE_HTML_CLASS_NAME, draftBody)
+        val (bodyWithQuote, signature) = doc.split(INFOMANIAK_SIGNATURE_HTML_CLASS_NAME, draftBody)
 
         val replyPosition = draftBody.lastIndexOfOrMax(INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME)
         val forwardPosition = draftBody.lastIndexOfOrMax(INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME)
-        val (body) = if (replyPosition < forwardPosition) {
+        val (body, quote) = if (replyPosition < forwardPosition) {
             doc.split(INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME, bodyWithQuote)
         } else {
             doc.split(INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME, bodyWithQuote)
         }
 
-        return body.htmlToText()
+        return BodyData(body, signature, quote)
     }
     //endregion
 
diff --git a/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt
index 941a36261b9..e0bcd89f6fd 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/SignatureUtils.kt
@@ -25,10 +25,6 @@ import javax.inject.Singleton
 @Singleton
 class SignatureUtils @Inject constructor() {
     fun encapsulateSignatureContentWithInfomaniakClass(signatureContent: String): String {
-        return """
-            <div id="$EDITOR_LOCAL_SIGNATURE_ID" class="$INFOMANIAK_SIGNATURE_HTML_CLASS_NAME">
-            $signatureContent
-            </div>
-        """.trimIndent()
+        return """<div id="$EDITOR_LOCAL_SIGNATURE_ID" class="$INFOMANIAK_SIGNATURE_HTML_CLASS_NAME">$signatureContent</div>"""
     }
 }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorBodyData.kt b/app/src/main/res/raw/include_quotes_script.js
similarity index 65%
rename from app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorBodyData.kt
rename to app/src/main/res/raw/include_quotes_script.js
index f759d5577ff..667ce6f5fb6 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorBodyData.kt
+++ b/app/src/main/res/raw/include_quotes_script.js
@@ -15,13 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.infomaniak.mail.ui.newMessage
 
-import com.infomaniak.mail.data.models.draft.Draft
-
-sealed interface EditorBodyData {
-    val bodyContentPayload: BodyContentPayload
-
-    data class Initial(override val bodyContentPayload: BodyContentPayload, val draft: Draft) : EditorBodyData
-    data class Reload(override val bodyContentPayload: BodyContentPayload) : EditorBodyData
-}
+(function() {
+    var quotes = %s;
+    getEditor().insertAdjacentHTML('beforeend', quotes);
+})();
diff --git a/app/src/main/res/raw/show_quotes_script.js b/app/src/main/res/raw/show_quotes_script.js
deleted file mode 100644
index 8d4350719ab..00000000000
--- a/app/src/main/res/raw/show_quotes_script.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Infomaniak Mail - Android
- * Copyright (C) 2026 Infomaniak Network SA
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-(function() {
-    var style = document.getElementById("quote-visibility")
-
-    if (style) {
-        style.remove()
-
-        // Handle CID image reload when showing
-        document.querySelectorAll('.ik_mail_quote img, .forwardContentMessage img').forEach(img => {
-         if (img.src.startsWith('cid:')) {
-            // Store original CID, then reload
-             const cid = img.src;
-             img.src = '';
-             setTimeout(() => img.src = cid, 0);
-         }
-       });
-    }
-})();

From b0e6dc7d394e418e0a8b0d312b2ecc4589665bc1 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Mon, 30 Mar 2026 08:23:30 +0200
Subject: [PATCH 62/94] fix: Fix adding quotes if they are null

---
 .../infomaniak/mail/ui/newMessage/NewMessageViewModel.kt    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index 07277900a33..2fa371a7666 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -914,7 +914,11 @@ class NewMessageViewModel @Inject constructor(
     }
 
     private fun String.addMissingQuotes(): String {
-        return if (areQuotesIncluded) this else this + initialQuote
+        return if (areQuotesIncluded || initialQuote == null) {
+            this
+        } else {
+            this + initialQuote
+        }
     }
 
     private suspend fun executeDraftAction(draftSaveConfiguration: DraftSaveConfiguration) = with(draftSaveConfiguration) {

From d7844281aa9f468f9dcfeef658c9dc05dd60f4e3 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Mon, 30 Mar 2026 09:09:57 +0200
Subject: [PATCH 63/94] fix: Fix channel consumption

---
 .../com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 0874606ce6d..c57ec2ded75 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -124,7 +124,6 @@ import dagger.hilt.android.AndroidEntryPoint
 import io.sentry.Sentry
 import io.sentry.SentryLevel
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.channels.consumeEach
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.filterNot
 import kotlinx.coroutines.launch
@@ -534,7 +533,7 @@ class NewMessageFragment : Fragment() {
     }
 
     private fun observeQuotesInclusion() = viewLifecycleOwner.lifecycleScope.launch {
-        newMessageViewModel.quotesToIncludeChannel.consumeEach { quote ->
+        for (quote in newMessageViewModel.quotesToIncludeChannel) {
             val escapedQuote = looselyEscapeAsStringLiteralForJs(quote)
             val includeQuoteScript = showQuotesScript.format(escapedQuote)
             binding.editorWebView.evaluateJavascript(includeQuoteScript, null)

From 370376cd5c6eacc086134d2f14f00d06c4c3b77d Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Mon, 30 Mar 2026 11:48:43 +0200
Subject: [PATCH 64/94] fix: Fix body with null signature

---
 .../com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index 2fa371a7666..26a2fe40213 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -352,7 +352,7 @@ class NewMessageViewModel @Inject constructor(
         val sanitizedBodyHtml = initialBody.toSanitizedHtml()
         val sanitizedBodyHtmlWithoutQuotes = if (initialQuote != null) {
             val (body, signature) = splitSignatureAndQuoteFromHtml(sanitizedBodyHtml)
-            body + signature
+            if (signature == null) body else body + signature
         } else {
             sanitizedBodyHtml
         }

From c953928c130c032d6df257e49ec364abdacead23 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Mon, 30 Mar 2026 13:53:40 +0200
Subject: [PATCH 65/94] fix: Add editor signature id if it is an existing draft

---
 .../mail/ui/newMessage/NewMessageViewModel.kt       | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index 26a2fe40213..a5e89e25318 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -87,6 +87,8 @@ import com.infomaniak.mail.utils.DraftInitManager
 import com.infomaniak.mail.utils.JsoupParserUtil.jsoupParseWithLog
 import com.infomaniak.mail.utils.LocalStorageUtils
 import com.infomaniak.mail.utils.MessageBodyUtils
+import com.infomaniak.mail.utils.MessageBodyUtils.EDITOR_LOCAL_SIGNATURE_ID
+import com.infomaniak.mail.utils.MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_CLASS_NAME
 import com.infomaniak.mail.utils.MessageBodyUtils.splitQuoteFromBody
 import com.infomaniak.mail.utils.MessageBodyUtils.splitSignatureAndQuoteFromHtml
 import com.infomaniak.mail.utils.SentryDebug
@@ -349,6 +351,14 @@ class NewMessageViewModel @Inject constructor(
     }
 
     private fun commonBodyProcessing(draft: Draft) {
+        // This is only used for existing drafts, for new drafts we add the signature id during the signature encapsulation.
+        // We added this here to avoid an extra parse.
+        if (!isNewMessage) {
+            val doc = jsoupParseWithLog(initialBody.content)
+            doc.getElementsByClass(INFOMANIAK_SIGNATURE_HTML_CLASS_NAME).attr("id", EDITOR_LOCAL_SIGNATURE_ID)
+            initialBody = BodyContentPayload(doc.body().html(), BodyContentType.HTML_UNSANITIZED)
+        }
+
         val sanitizedBodyHtml = initialBody.toSanitizedHtml()
         val sanitizedBodyHtmlWithoutQuotes = if (initialQuote != null) {
             val (body, signature) = splitSignatureAndQuoteFromHtml(sanitizedBodyHtml)
@@ -381,6 +391,7 @@ class NewMessageViewModel @Inject constructor(
                 BodyContentType.TEXT_PLAIN_WITHOUT_HTML
             else
                 BodyContentType.HTML_UNSANITIZED
+
             initialBody = BodyContentPayload(draft.body, contentType)
             initialQuote = splitQuoteFromBody(draft)?.let {
                 BodyContentPayload(it, BodyContentType.HTML_UNSANITIZED).toSanitizedHtml()
@@ -1009,7 +1020,7 @@ class NewMessageViewModel @Inject constructor(
         val doc = jsoupParseWithLog(html)
 
         // Remove id used for replacing signature.
-        doc.getElementById(MessageBodyUtils.EDITOR_LOCAL_SIGNATURE_ID)?.removeAttr("id")
+        doc.getElementById(EDITOR_LOCAL_SIGNATURE_ID)?.removeAttr("id")
 
         // If the user deleted the quotes' text, remove the quotes' div so user doesn't write in it
         // (the text could get hidden later with the toggle button).

From 178d00bbe8610d1bbb954ff5dd6a8dd4bc4e1bcb Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Mon, 30 Mar 2026 16:06:24 +0200
Subject: [PATCH 66/94] fix: Remove useless isBodyBlank jsoup parse

---
 .../mail/ui/newMessage/NewMessageViewModel.kt      |  8 ++++----
 .../com/infomaniak/mail/utils/MessageBodyUtils.kt  | 14 ++------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index a5e89e25318..b7614629e40 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -360,20 +360,20 @@ class NewMessageViewModel @Inject constructor(
         }
 
         val sanitizedBodyHtml = initialBody.toSanitizedHtml()
-        val sanitizedBodyHtmlWithoutQuotes = if (initialQuote != null) {
             val (body, signature) = splitSignatureAndQuoteFromHtml(sanitizedBodyHtml)
+        val sanitizedBodyHtmlWithoutQuotes = if (initialQuote != null) {
             if (signature == null) body else body + signature
         } else {
             sanitizedBodyHtml
         }
         val sanitizedBodyWithoutQuotes = BodyContentPayload(sanitizedBodyHtmlWithoutQuotes, BodyContentType.HTML_SANITIZED)
         draft.saveSnapshot(sanitizedBodyHtml)
-        initEditorElementsVisibility(sanitizedBodyWithoutQuotes)
+        initEditorElementsVisibility(body)
         editorBodyInitializer.postValue(sanitizedBodyWithoutQuotes)
     }
 
-    private fun initEditorElementsVisibility(initialBody: BodyContentPayload) {
-        val isBodyEmpty = MessageBodyUtils.isBodyBlank(initialBody)
+    private fun initEditorElementsVisibility(body: String) {
+        val isBodyEmpty = body.isHtmlBlank()
         changePlaceholderVisibility(isVisible = isBodyEmpty)
 
         if (initialQuote != null) {
diff --git a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
index 60d09878a7b..d03f411dfe4 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
@@ -121,18 +121,8 @@ object MessageBodyUtils {
         return htmlDocument.outerHtml() to quotes
     }
 
-    fun isBodyBlank(body: BodyContentPayload): Boolean {
-        if (body.content.isBlank()) return true
-
-        return when (body.type) {
-            BodyContentType.HTML_UNSANITIZED,
-            BodyContentType.HTML_SANITIZED -> splitSignatureAndQuoteFromHtml(body.content).body.htmlToText().isBlank()
-            // On these cases we should return body content, but we know it's not blank already.
-            // We don't split text plain with HTML because with this type it shouldn't have quotes or signature
-            // and it would require to transform it to HTML which is an expensive operation
-            BodyContentType.TEXT_PLAIN_WITHOUT_HTML,
-            BodyContentType.TEXT_PLAIN_WITH_HTML -> false
-        }
+    fun String.isHtmlBlank(): Boolean {
+        return htmlToText().isBlank()
     }
 
     fun splitQuoteFromBody(draft: Draft): String? {

From f2180bea272f3fc8564a301017910c4968afefa6 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Mon, 30 Mar 2026 16:37:29 +0200
Subject: [PATCH 67/94] fix: Only use 2 jsoup parse instead of 3

---
 .../mail/ui/newMessage/NewMessageViewModel.kt |  9 +++--
 .../infomaniak/mail/utils/MessageBodyUtils.kt | 37 ++++++++++---------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index b7614629e40..1d63fdbc678 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -89,6 +89,7 @@ import com.infomaniak.mail.utils.LocalStorageUtils
 import com.infomaniak.mail.utils.MessageBodyUtils
 import com.infomaniak.mail.utils.MessageBodyUtils.EDITOR_LOCAL_SIGNATURE_ID
 import com.infomaniak.mail.utils.MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_CLASS_NAME
+import com.infomaniak.mail.utils.MessageBodyUtils.isHtmlBlank
 import com.infomaniak.mail.utils.MessageBodyUtils.splitQuoteFromBody
 import com.infomaniak.mail.utils.MessageBodyUtils.splitSignatureAndQuoteFromHtml
 import com.infomaniak.mail.utils.SentryDebug
@@ -351,16 +352,16 @@ class NewMessageViewModel @Inject constructor(
     }
 
     private fun commonBodyProcessing(draft: Draft) {
+        val sanitizedBodyHtml = initialBody.toSanitizedHtml()
+        val doc = jsoupParseWithLog(sanitizedBodyHtml)
+
         // This is only used for existing drafts, for new drafts we add the signature id during the signature encapsulation.
         // We added this here to avoid an extra parse.
         if (!isNewMessage) {
-            val doc = jsoupParseWithLog(initialBody.content)
             doc.getElementsByClass(INFOMANIAK_SIGNATURE_HTML_CLASS_NAME).attr("id", EDITOR_LOCAL_SIGNATURE_ID)
-            initialBody = BodyContentPayload(doc.body().html(), BodyContentType.HTML_UNSANITIZED)
         }
 
-        val sanitizedBodyHtml = initialBody.toSanitizedHtml()
-            val (body, signature) = splitSignatureAndQuoteFromHtml(sanitizedBodyHtml)
+        val (body, signature) = splitSignatureAndQuoteFromHtml(doc)
         val sanitizedBodyHtmlWithoutQuotes = if (initialQuote != null) {
             if (signature == null) body else body + signature
         } else {
diff --git a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
index d03f411dfe4..67c58409c26 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
@@ -22,8 +22,6 @@ import com.infomaniak.mail.data.models.draft.Draft
 import com.infomaniak.mail.data.models.message.Body
 import com.infomaniak.mail.data.models.message.Message
 import com.infomaniak.mail.data.models.message.SubBody
-import com.infomaniak.mail.ui.newMessage.BodyContentPayload
-import com.infomaniak.mail.ui.newMessage.BodyContentType
 import com.infomaniak.mail.ui.newMessage.NewMessageViewModel.BodyData
 import com.infomaniak.mail.utils.JsoupParserUtil.jsoupParseWithLog
 import com.infomaniak.mail.utils.JsoupParserUtil.measureAndLogMemoryUsage
@@ -34,6 +32,7 @@ import io.sentry.SentryLevel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ensureActive
 import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
 
 object MessageBodyUtils {
 
@@ -136,12 +135,17 @@ object MessageBodyUtils {
         }
     }
 
+    fun splitSignatureAndQuoteFromHtml(body: String): BodyData {
+        val doc = jsoupParseWithLog(body)
+        return splitSignatureAndQuoteFromHtml(doc)
+    }
+
     /**
      * This only takes into account infomaniak's quotes and signatures.
      */
-    fun splitSignatureAndQuoteFromHtml(draftBody: String): BodyData {
+    fun splitSignatureAndQuoteFromHtml(document: Document): BodyData {
 
-        fun Document.split(divClassName: String, defaultValue: String): Pair<String, String?> {
+        fun Document.split(divClassName: String, defaultValue: Element): Pair<Element, String?> {
             // We need to use select and not getElementByClass because getElementByClass adds a \n after every <br>.
             // The function remove() also adds \n after each <br> of it.
             // So we need to use select, save the second part of the split first, and then do remove, to save the correct value
@@ -149,29 +153,28 @@ object MessageBodyUtils {
             return select(".$divClassName").firstOrNull()?.let {
                 val second = if (it.html().isBlank()) null else it.outerHtml()
                 it.remove()
-                val first = body().html()
+                val first = body()
                 first to second
             } ?: (defaultValue to null)
         }
 
-        fun String.lastIndexOfOrMax(string: String): Int {
-            val index = lastIndexOf(string)
-            return if (index == -1) Int.MAX_VALUE else index
-        }
-
-        val doc = jsoupParseWithLog(draftBody).also { it.outputSettings().prettyPrint(false) }
+        document.outputSettings().prettyPrint(false)
 
-        val (bodyWithQuote, signature) = doc.split(INFOMANIAK_SIGNATURE_HTML_CLASS_NAME, draftBody)
+        val (bodyWithQuote, signature) = document.split(INFOMANIAK_SIGNATURE_HTML_CLASS_NAME, document)
 
-        val replyPosition = draftBody.lastIndexOfOrMax(INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME)
-        val forwardPosition = draftBody.lastIndexOfOrMax(INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME)
+        val replyPosition = document.getElementPositionOrMax(".$INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME")
+        val forwardPosition = document.getElementPositionOrMax(".$INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME")
         val (body, quote) = if (replyPosition < forwardPosition) {
-            doc.split(INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME, bodyWithQuote)
+            document.split(INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME, bodyWithQuote)
         } else {
-            doc.split(INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME, bodyWithQuote)
+            document.split(INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME, bodyWithQuote)
         }
 
-        return BodyData(body, signature, quote)
+        return BodyData(body.html(), signature, quote)
+    }
+
+    private fun Document.getElementPositionOrMax(className: String): Int {
+        return this.selectFirst(className)?.sourceRange()?.start()?.pos() ?: Int.MAX_VALUE
     }
     //endregion
 

From 222b8e719a948848caf4aa3ad41f372f92a04eb4 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Tue, 31 Mar 2026 09:25:36 +0200
Subject: [PATCH 68/94] fix: Not using body with signature id if the body didnt
 have quotes

---
 .../infomaniak/mail/ui/newMessage/NewMessageViewModel.kt   | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index 1d63fdbc678..d1b48b1a989 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -362,11 +362,8 @@ class NewMessageViewModel @Inject constructor(
         }
 
         val (body, signature) = splitSignatureAndQuoteFromHtml(doc)
-        val sanitizedBodyHtmlWithoutQuotes = if (initialQuote != null) {
-            if (signature == null) body else body + signature
-        } else {
-            sanitizedBodyHtml
-        }
+        val sanitizedBodyHtmlWithoutQuotes = if (signature == null) body else body + signature
+
         val sanitizedBodyWithoutQuotes = BodyContentPayload(sanitizedBodyHtmlWithoutQuotes, BodyContentType.HTML_SANITIZED)
         draft.saveSnapshot(sanitizedBodyHtml)
         initEditorElementsVisibility(body)

From 7c68a7aa493a1b933c0b4afdced78f9a31c0b5f8 Mon Sep 17 00:00:00 2001
From: Gibran Chevalley <gibran.chevalley@infomaniak.com>
Date: Tue, 31 Mar 2026 10:22:12 +0200
Subject: [PATCH 69/94] refactor: Clean code a bit and add documentation

---
 .../mail/ui/newMessage/NewMessageViewModel.kt     | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index d1b48b1a989..c5557638142 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -353,6 +353,11 @@ class NewMessageViewModel @Inject constructor(
 
     private fun commonBodyProcessing(draft: Draft) {
         val sanitizedBodyHtml = initialBody.toSanitizedHtml()
+        // We save the initial snapshot with its quotes, because quotes are added during snapshot comparison, ensuring it works
+        // whether the user included them or not.
+        // We do not save the custom editor local signature id because we remove it before snapshot comparison.
+        draft.saveSnapshot(sanitizedBodyHtml)
+
         val doc = jsoupParseWithLog(sanitizedBodyHtml)
 
         // This is only used for existing drafts, for new drafts we add the signature id during the signature encapsulation.
@@ -363,16 +368,18 @@ class NewMessageViewModel @Inject constructor(
 
         val (body, signature) = splitSignatureAndQuoteFromHtml(doc)
         val sanitizedBodyHtmlWithoutQuotes = if (signature == null) body else body + signature
-
         val sanitizedBodyWithoutQuotes = BodyContentPayload(sanitizedBodyHtmlWithoutQuotes, BodyContentType.HTML_SANITIZED)
-        draft.saveSnapshot(sanitizedBodyHtml)
+
         initEditorElementsVisibility(body)
+        /**
+         * We load the body into the editor without its quotes to improve performances. We load them only if the user expands the
+         * quotes section. Anyhow, the quotes will always be added before executing the draft action inside [addMissingQuotes].
+         */
         editorBodyInitializer.postValue(sanitizedBodyWithoutQuotes)
     }
 
     private fun initEditorElementsVisibility(body: String) {
-        val isBodyEmpty = body.isHtmlBlank()
-        changePlaceholderVisibility(isVisible = isBodyEmpty)
+        changePlaceholderVisibility(isVisible = body.isHtmlBlank())
 
         if (initialQuote != null) {
             changeQuotesButtonVisibility(isVisible = true)

From 4cea07573871a01d4059d2ecdb439e8be009fdc1 Mon Sep 17 00:00:00 2001
From: Gibran Chevalley <gibran.chevalley@infomaniak.com>
Date: Tue, 31 Mar 2026 10:24:36 +0200
Subject: [PATCH 70/94] fix: Compare snapshots without
 EDITOR_LOCAL_SIGNATURE_ID

---
 .../com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index c5557638142..d022ebd1d32 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -941,7 +941,7 @@ class NewMessageViewModel @Inject constructor(
         val localUuid = draftLocalUuid ?: return@with
         val subject = subjectValue.ifBlank { null }?.take(SUBJECT_MAX_LENGTH)
 
-        val bodyWithQuotes = uiBodyValue.addMissingQuotes()
+        val bodyWithQuotes = removeUnwantedHtml(uiBodyValue.addMissingQuotes())
         if (action == DraftAction.SAVE && isSnapshotTheSame(subject, bodyWithQuotes)) {
             if (isFinishing && isNewMessage) removeDraftFromRealm(localUuid)
             return@with
@@ -1015,7 +1015,7 @@ class NewMessageViewModel @Inject constructor(
             isNewMessage = false
         }
 
-        body = removeUnwantedHtml(uiBodyValue)
+        body = uiBodyValue
     }
 
     /**

From 3c1669bba659e61262163925f7922f0418b8864e Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Tue, 31 Mar 2026 16:09:14 +0200
Subject: [PATCH 71/94] fix: Split and save body, signature and quotes and fix
 snapshot

---
 .../mail/ui/newMessage/NewMessageViewModel.kt | 104 +++++++++---------
 .../infomaniak/mail/utils/MessageBodyUtils.kt |  34 +++---
 2 files changed, 74 insertions(+), 64 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index d022ebd1d32..ca484b15047 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -90,8 +90,7 @@ import com.infomaniak.mail.utils.MessageBodyUtils
 import com.infomaniak.mail.utils.MessageBodyUtils.EDITOR_LOCAL_SIGNATURE_ID
 import com.infomaniak.mail.utils.MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_CLASS_NAME
 import com.infomaniak.mail.utils.MessageBodyUtils.isHtmlBlank
-import com.infomaniak.mail.utils.MessageBodyUtils.splitQuoteFromBody
-import com.infomaniak.mail.utils.MessageBodyUtils.splitSignatureAndQuoteFromHtml
+import com.infomaniak.mail.utils.MessageBodyUtils.splitSignatureAndQuoteFromBody
 import com.infomaniak.mail.utils.SentryDebug
 import com.infomaniak.mail.utils.SharedUtils
 import com.infomaniak.mail.utils.SignatureUtils
@@ -168,7 +167,9 @@ class NewMessageViewModel @Inject constructor(
 
     //region Initial data
     private var initialBody: BodyContentPayload = BodyContentPayload.emptyBody()
-    private var initialQuote: String? = null // is always sanitized and it's only set in initDraftAndViewModel
+    private var initialSignature: BodyContentPayload? = null
+    // It is always sanitized to safely be inserted when the user clicks on "show quotes" and it's only set in initDraftAndViewModel
+    private var initialSanitizedQuote: String? = null
     //endregion
 
     //region UI data
@@ -352,55 +353,57 @@ class NewMessageViewModel @Inject constructor(
     }
 
     private fun commonBodyProcessing(draft: Draft) {
-        val sanitizedBodyHtml = initialBody.toSanitizedHtml()
-        // We save the initial snapshot with its quotes, because quotes are added during snapshot comparison, ensuring it works
-        // whether the user included them or not.
-        // We do not save the custom editor local signature id because we remove it before snapshot comparison.
-        draft.saveSnapshot(sanitizedBodyHtml)
-
-        val doc = jsoupParseWithLog(sanitizedBodyHtml)
-
-        // This is only used for existing drafts, for new drafts we add the signature id during the signature encapsulation.
-        // We added this here to avoid an extra parse.
-        if (!isNewMessage) {
-            doc.getElementsByClass(INFOMANIAK_SIGNATURE_HTML_CLASS_NAME).attr("id", EDITOR_LOCAL_SIGNATURE_ID)
-        }
+        val sanitizedBody = initialBody.toSanitizedHtml()
+        initEditorElementsVisibility(sanitizedBody)
 
-        val (body, signature) = splitSignatureAndQuoteFromHtml(doc)
-        val sanitizedBodyHtmlWithoutQuotes = if (signature == null) body else body + signature
-        val sanitizedBodyWithoutQuotes = BodyContentPayload(sanitizedBodyHtmlWithoutQuotes, BodyContentType.HTML_SANITIZED)
-
-        initEditorElementsVisibility(body)
+        val sanitizedSignature = initialSignature?.toSanitizedHtml()
+        val sanitizedBodyWithoutQuotes = sanitizedBody.mergeWithSignature(sanitizedSignature)
+        val sanitizedBodyContentWithoutQuotes = BodyContentPayload(sanitizedBodyWithoutQuotes, BodyContentType.HTML_SANITIZED)
         /**
          * We load the body into the editor without its quotes to improve performances. We load them only if the user expands the
          * quotes section. Anyhow, the quotes will always be added before executing the draft action inside [addMissingQuotes].
          */
-        editorBodyInitializer.postValue(sanitizedBodyWithoutQuotes)
+        editorBodyInitializer.postValue(sanitizedBodyContentWithoutQuotes)
+
+        val sanitizedBodyWithQuotes = sanitizedBodyWithoutQuotes.mergeWithQuotes(initialSanitizedQuote)
+        // We save the initial snapshot with its quotes, because quotes are added during snapshot comparison, ensuring it works
+        // whether the user included them or not.
+        draft.saveSnapshot(sanitizedBodyWithQuotes)
     }
 
     private fun initEditorElementsVisibility(body: String) {
         changePlaceholderVisibility(isVisible = body.isHtmlBlank())
 
-        if (initialQuote != null) {
+        if (initialSanitizedQuote != null) {
             changeQuotesButtonVisibility(isVisible = true)
         }
     }
 
     private suspend fun getExistingDraft(localUuid: String?): Draft? {
+
+        fun String.sanitize(): String {
+            return BodyContentPayload(this, BodyContentType.HTML_UNSANITIZED).toSanitizedHtml()
+        }
+
         return getLocalOrRemoteDraft(localUuid)?.also { draft ->
             saveNavArgsToSavedState(draft.localUuid)
             if (draft.identityId.isNullOrBlank()) {
                 draft.identityId = currentMailbox().getDefaultSignatureWithFallback().id.toString()
             }
-            val contentType = if (draft.mimeType == Utils.TEXT_PLAIN)
-                BodyContentType.TEXT_PLAIN_WITHOUT_HTML
-            else
-                BodyContentType.HTML_UNSANITIZED
-
-            initialBody = BodyContentPayload(draft.body, contentType)
-            initialQuote = splitQuoteFromBody(draft)?.let {
-                BodyContentPayload(it, BodyContentType.HTML_UNSANITIZED).toSanitizedHtml()
+
+            val doc = jsoupParseWithLog(draft.body)
+
+            // This is only used for existing drafts, for new drafts we add the signature id during the signature encapsulation.
+            // We added this here to avoid an extra parse.
+            if (!isNewMessage) {
+                doc.getElementsByClass(INFOMANIAK_SIGNATURE_HTML_CLASS_NAME).attr("id", EDITOR_LOCAL_SIGNATURE_ID)
             }
+
+            val (body, signature, quote) = splitSignatureAndQuoteFromBody(draft)
+            initialBody = body
+            initialSignature = signature?.let { BodyContentPayload(it, BodyContentType.HTML_UNSANITIZED) }
+            initialSanitizedQuote = quote?.sanitize()
+
             return draft
         }
     }
@@ -424,32 +427,30 @@ class NewMessageViewModel @Inject constructor(
                         if (hasFailedFetching) return@let
 
                         initializeReplyForwardDraftValues(draft = this, fullMessage)
-                        initialQuote = draftInitManager.createQuote(draftMode, fullMessage, attachments)?.let {
+                        initialSanitizedQuote = draftInitManager.createQuote(draftMode, fullMessage, attachments)?.let {
                             BodyContentPayload(it, BodyContentType.HTML_UNSANITIZED).toSanitizedHtml()
                         }
                     }
             }
         }
 
-        var initialSignature: String? = null
+        val signature: Signature
         with(draftInitManager) {
-            val signature = chooseSignature(currentMailbox().email, signatures, draftMode, previousMessage)
+            signature = chooseSignature(currentMailbox().email, signatures, draftMode, previousMessage)
             setSignatureIdentity(signature)
-            initialSignature = signatureUtils.encapsulateSignatureContentWithInfomaniakClass(signature.content)
         }
+        val encapsulatedSignature = signatureUtils.encapsulateSignatureContentWithInfomaniakClass(signature.content)
+        initialSignature = BodyContentPayload(encapsulatedSignature, BodyContentType.HTML_UNSANITIZED)
 
         populateWithExternalMailDataIfNeeded(draft = this, intent)
-
-        val mergedBodyContent = initialBody.mergeWithSignatureAndQuotes(initialSignature, initialQuote)
-        initialBody = BodyContentPayload(mergedBodyContent, BodyContentType.HTML_UNSANITIZED)
     }
 
-    private fun BodyContentPayload.mergeWithSignatureAndQuotes(initialSignature: String?, initialQuote: String?): String {
-        var body = toSanitizedHtml()
-        if (!initialSignature.isNullOrEmpty()) body += initialSignature
-        if (!initialQuote.isNullOrEmpty()) body += initialQuote
+    private fun String.mergeWithSignature(signature: String?): String {
+        return if (signature.isNullOrEmpty()) this else this + signature
+    }
 
-        return body
+    private fun String.mergeWithQuotes(quote: String?): String {
+        return if (quote.isNullOrEmpty()) this else this + quote
     }
 
     /**
@@ -585,7 +586,7 @@ class NewMessageViewModel @Inject constructor(
     }
 
     fun includeQuotes() {
-        initialQuote?.let { _quotesToIncludeChannel.trySend(it) }
+        initialSanitizedQuote?.let { _quotesToIncludeChannel.trySend(it) }
         areQuotesIncluded = true
     }
 
@@ -930,10 +931,10 @@ class NewMessageViewModel @Inject constructor(
     }
 
     private fun String.addMissingQuotes(): String {
-        return if (areQuotesIncluded || initialQuote == null) {
+        return if (areQuotesIncluded || initialSanitizedQuote == null) {
             this
         } else {
-            this + initialQuote
+            this + initialSanitizedQuote
         }
     }
 
@@ -941,7 +942,7 @@ class NewMessageViewModel @Inject constructor(
         val localUuid = draftLocalUuid ?: return@with
         val subject = subjectValue.ifBlank { null }?.take(SUBJECT_MAX_LENGTH)
 
-        val bodyWithQuotes = removeUnwantedHtml(uiBodyValue.addMissingQuotes())
+        val bodyWithQuotes = uiBodyValue.addMissingQuotes()
         if (action == DraftAction.SAVE && isSnapshotTheSame(subject, bodyWithQuotes)) {
             if (isFinishing && isNewMessage) removeDraftFromRealm(localUuid)
             return@with
@@ -1015,7 +1016,7 @@ class NewMessageViewModel @Inject constructor(
             isNewMessage = false
         }
 
-        body = uiBodyValue
+        body = removeUnwantedHtml(uiBodyValue)
     }
 
     /**
@@ -1023,6 +1024,8 @@ class NewMessageViewModel @Inject constructor(
      */
     private fun removeUnwantedHtml(html: String): String {
         val doc = jsoupParseWithLog(html)
+        // This assures that jsoup doesn't add line breaks that will impact the snapshot comparison
+        doc.outputSettings().prettyPrint(false)
 
         // Remove id used for replacing signature.
         doc.getElementById(EDITOR_LOCAL_SIGNATURE_ID)?.removeAttr("id")
@@ -1031,8 +1034,7 @@ class NewMessageViewModel @Inject constructor(
         // (the text could get hidden later with the toggle button).
         doc.removeEmptyElements(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME)
         doc.removeEmptyElements(MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME)
-
-        return doc.html()
+        return doc.body().html()
     }
 
     private fun Document.removeEmptyElements(className: String) {
@@ -1186,7 +1188,7 @@ class NewMessageViewModel @Inject constructor(
 
     private data class SubjectAndBodyData(val subject: String, val body: String, val expirationId: Int)
 
-    data class BodyData(val body: String, val signature: String?, val quote: String?)
+    data class BodyData(val body: BodyContentPayload, val signature: String?, val quote: String?)
 
     companion object {
         private val TAG = NewMessageViewModel::class.java.simpleName
diff --git a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
index 67c58409c26..067c4d0cc4e 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
@@ -22,6 +22,8 @@ import com.infomaniak.mail.data.models.draft.Draft
 import com.infomaniak.mail.data.models.message.Body
 import com.infomaniak.mail.data.models.message.Message
 import com.infomaniak.mail.data.models.message.SubBody
+import com.infomaniak.mail.ui.newMessage.BodyContentPayload
+import com.infomaniak.mail.ui.newMessage.BodyContentType
 import com.infomaniak.mail.ui.newMessage.NewMessageViewModel.BodyData
 import com.infomaniak.mail.utils.JsoupParserUtil.jsoupParseWithLog
 import com.infomaniak.mail.utils.JsoupParserUtil.measureAndLogMemoryUsage
@@ -124,18 +126,7 @@ object MessageBodyUtils {
         return htmlToText().isBlank()
     }
 
-    fun splitQuoteFromBody(draft: Draft): String? {
-        val remoteBody = draft.body
-        if (remoteBody.isEmpty()) return null
-
-        return when (draft.mimeType) {
-            Utils.TEXT_PLAIN -> null
-            Utils.TEXT_HTML -> splitSignatureAndQuoteFromHtml(remoteBody).quote
-            else -> error("Cannot load an email which is not of type text/plain or text/html")
-        }
-    }
-
-    fun splitSignatureAndQuoteFromHtml(body: String): BodyData {
+    private fun splitSignatureAndQuoteFromHtml(body: String): BodyData {
         val doc = jsoupParseWithLog(body)
         return splitSignatureAndQuoteFromHtml(doc)
     }
@@ -170,7 +161,24 @@ object MessageBodyUtils {
             document.split(INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME, bodyWithQuote)
         }
 
-        return BodyData(body.html(), signature, quote)
+        return BodyData(BodyContentPayload(body.html(), BodyContentType.HTML_UNSANITIZED), signature, quote)
+    }
+
+    fun splitSignatureAndQuoteFromBody(draft: Draft): BodyData {
+        val remoteBody = draft.body
+        if (remoteBody.isEmpty()) return BodyData(BodyContentPayload.emptyBody(), null, null)
+
+        val (body, signature, quote) = when (draft.mimeType) {
+            Utils.TEXT_PLAIN -> BodyData(
+                body = BodyContentPayload(remoteBody, BodyContentType.TEXT_PLAIN_WITHOUT_HTML),
+                signature = null,
+                quote = null
+            )
+            Utils.TEXT_HTML -> splitSignatureAndQuoteFromHtml(remoteBody)
+            else -> error("Cannot load an email which is not of type text/plain or text/html")
+        }
+
+        return BodyData(body, signature, quote)
     }
 
     private fun Document.getElementPositionOrMax(className: String): Int {

From e3a5c81abae606ee6a85c7036a8e18c35aced202 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Tue, 31 Mar 2026 17:04:39 +0200
Subject: [PATCH 72/94] refactor: Code refactor and copyrights update

---
 .../infomaniak/mail/ui/newMessage/BodyContentPayload.kt   | 8 ++------
 .../infomaniak/mail/ui/newMessage/EditorContentManager.kt | 6 ++----
 .../infomaniak/mail/ui/newMessage/NewMessageFragment.kt   | 8 +++-----
 .../main/java/com/infomaniak/mail/utils/HtmlFormatter.kt  | 4 ++--
 .../java/com/infomaniak/mail/utils/MessageBodyUtils.kt    | 2 +-
 5 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt
index 595213a5402..bea914dbea5 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/BodyContentPayload.kt
@@ -1,6 +1,6 @@
 /*
  * Infomaniak Mail - Android
- * Copyright (C) 2024 Infomaniak Network SA
+ * Copyright (C) 2024-2026 Infomaniak Network SA
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,11 +25,7 @@ data class BodyContentPayload(val content: String, val type: BodyContentType) {
 
     companion object {
         // Add some empty lines in the body so the body focus on these lines and not in the signature
-        fun emptyBody() =
-            BodyContentPayload(
-                content = "<br><br>",
-                type = BodyContentType.HTML_SANITIZED
-            )
+        fun emptyBody() = BodyContentPayload(content = "<br><br>", type = BodyContentType.HTML_SANITIZED)
     }
 }
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorContentManager.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorContentManager.kt
index 6f7e47193bc..f738c607f04 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorContentManager.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorContentManager.kt
@@ -1,6 +1,6 @@
 /*
  * Infomaniak Mail - Android
- * Copyright (C) 2024 Infomaniak Network SA
+ * Copyright (C) 2024-2026 Infomaniak Network SA
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -48,9 +48,7 @@ class EditorContentManager @Inject constructor() {
         }
 
 
-        private fun getSanitizedHtml(html: String): String {
-            return html
-        }
+        private fun getSanitizedHtml(html: String): String = html
 
         private fun getUnsanitizedHtml(html: String) = getSanitizedHtml(html.sanitize())
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index c57ec2ded75..66fac5e3f22 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -95,8 +95,8 @@ import com.infomaniak.mail.utils.HtmlFormatter.Companion.getCustomStyle
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getDeletedInlineImagesObserverScript
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getEditorJsBridgeScript
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getHideQuotesStyle
+import com.infomaniak.mail.utils.HtmlFormatter.Companion.getIncludeQuotesScript
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getReplaceSignatureScript
-import com.infomaniak.mail.utils.HtmlFormatter.Companion.getShowQuotesScript
 import com.infomaniak.mail.utils.MessageBodyUtils.EDITOR_LOCAL_SIGNATURE_ID
 import com.infomaniak.mail.utils.MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME
 import com.infomaniak.mail.utils.MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME
@@ -142,7 +142,7 @@ class NewMessageFragment : Fragment() {
         requireActivity().intent?.extras?.let(NewMessageActivityArgs::fromBundle) ?: NewMessageActivityArgs()
     }
     private val replaceSignatureScript by lazy { requireContext().getReplaceSignatureScript() }
-    private val showQuotesScript by lazy { requireContext().getShowQuotesScript() }
+    private val showQuotesScript by lazy { requireContext().getIncludeQuotesScript() }
     private val hideQuotesStyle by lazy { requireContext().getHideQuotesStyle() }
     private val deletedInlineImagesObserverScript by lazy { requireContext().getDeletedInlineImagesObserverScript() }
     private val editorJsBridgeScript by lazy { requireContext().getEditorJsBridgeScript() }
@@ -363,9 +363,7 @@ class NewMessageFragment : Fragment() {
     override fun onDestroyView() {
         // This block of code is needed in order to keep and reload the content of the editor across configuration changes.
         binding.editorWebView.exportHtml { html ->
-            newMessageViewModel.editorBodyInitializer.postValue(
-                BodyContentPayload(html, BodyContentType.HTML_SANITIZED)
-            )
+            newMessageViewModel.editorBodyInitializer.postValue(BodyContentPayload(html, BodyContentType.HTML_SANITIZED))
         }
 
         addressListPopupWindow = null
diff --git a/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt b/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
index 9dde9c01843..80833c7f522 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
@@ -1,6 +1,6 @@
 /*
  * Infomaniak Mail - Android
- * Copyright (C) 2023-2025 Infomaniak Network SA
+ * Copyright (C) 2023-2026 Infomaniak Network SA
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -235,7 +235,7 @@ class HtmlFormatter(private val html: String) {
 
         fun Context.getHideQuotesStyle(): String = loadCss(R.raw.hide_quotes_style)
 
-        fun Context.getShowQuotesScript(): String = loadScript(R.raw.include_quotes_script)
+        fun Context.getIncludeQuotesScript(): String = loadScript(R.raw.include_quotes_script)
 
         fun Context.getDeletedInlineImagesObserverScript(): String = loadScript(R.raw.deleted_inline_images_observer)
 
diff --git a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
index 067c4d0cc4e..10df1e5e188 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
@@ -1,6 +1,6 @@
 /*
  * Infomaniak Mail - Android
- * Copyright (C) 2023-2024 Infomaniak Network SA
+ * Copyright (C) 2023-2026 Infomaniak Network SA
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

From f14f8475bd8a440db600e6a621409959dcbcad6a Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Wed, 1 Apr 2026 10:15:53 +0200
Subject: [PATCH 73/94] refactor: Remove unnecessary function getSanitizedHtml
 when the content is already sanitized

---
 .../mail/ui/newMessage/EditorContentManager.kt        | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorContentManager.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorContentManager.kt
index f738c607f04..13cb194a5cf 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorContentManager.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorContentManager.kt
@@ -40,24 +40,21 @@ class EditorContentManager @Inject constructor() {
 
         fun BodyContentPayload.toSanitizedHtml(): String {
             return when (type) {
-                BodyContentType.HTML_SANITIZED -> getSanitizedHtml(content)
+                BodyContentType.HTML_SANITIZED -> content
                 BodyContentType.HTML_UNSANITIZED -> getUnsanitizedHtml(content)
                 BodyContentType.TEXT_PLAIN_WITH_HTML -> getPlainTextAndInterpretHtml(content)
                 BodyContentType.TEXT_PLAIN_WITHOUT_HTML -> getPlainTextAndEscapeHtml(content)
             }
         }
 
-
-        private fun getSanitizedHtml(html: String): String = html
-
-        private fun getUnsanitizedHtml(html: String) = getSanitizedHtml(html.sanitize())
+        private fun getUnsanitizedHtml(html: String) = html.sanitize()
 
         private fun getPlainTextAndInterpretHtml(text: String): String {
-            return getSanitizedHtml(text.replaceNewLines().sanitize())
+            return text.replaceNewLines().sanitize()
         }
 
         private fun getPlainTextAndEscapeHtml(text: String): String {
-            return getSanitizedHtml(text.escapeHtmlCharacters().replaceNewLines())
+            return text.escapeHtmlCharacters().replaceNewLines()
         }
 
         private fun String.escapeHtmlCharacters(): String = Html.escapeHtml(this)

From 87e2611a853df7d23331e15dafc1347fab43d459 Mon Sep 17 00:00:00 2001
From: Gibran Chevalley <gibran.chevalley@infomaniak.com>
Date: Wed, 1 Apr 2026 11:56:17 +0200
Subject: [PATCH 74/94] refactor: Save snapshot outside common body processing

---
 .../mail/ui/newMessage/NewMessageViewModel.kt   | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index ca484b15047..2cd9da5ca13 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -343,7 +343,10 @@ class NewMessageViewModel @Inject constructor(
             realm.write { DraftController.upsertDraftBlocking(it, realm = this) }
             it.initLiveData(signatures)
 
-            commonBodyProcessing(it)
+            val sanitizedBodyWithQuotes = getBodyAfterCommonProcessing()
+            // We save the initial snapshot with its quotes, because quotes are added during snapshot comparison, ensuring it works
+            // whether the user included them or not.
+            draft.saveSnapshot(sanitizedBodyWithQuotes)
 
             _isShimmering.emit(false)
             initResult.postValue(InitResult(it, signatures))
@@ -352,7 +355,7 @@ class NewMessageViewModel @Inject constructor(
         emit(draft)
     }
 
-    private fun commonBodyProcessing(draft: Draft) {
+    private fun getBodyAfterCommonProcessing(): String {
         val sanitizedBody = initialBody.toSanitizedHtml()
         initEditorElementsVisibility(sanitizedBody)
 
@@ -365,18 +368,12 @@ class NewMessageViewModel @Inject constructor(
          */
         editorBodyInitializer.postValue(sanitizedBodyContentWithoutQuotes)
 
-        val sanitizedBodyWithQuotes = sanitizedBodyWithoutQuotes.mergeWithQuotes(initialSanitizedQuote)
-        // We save the initial snapshot with its quotes, because quotes are added during snapshot comparison, ensuring it works
-        // whether the user included them or not.
-        draft.saveSnapshot(sanitizedBodyWithQuotes)
+        return sanitizedBodyWithoutQuotes.mergeWithQuotes(initialSanitizedQuote)
     }
 
     private fun initEditorElementsVisibility(body: String) {
         changePlaceholderVisibility(isVisible = body.isHtmlBlank())
-
-        if (initialSanitizedQuote != null) {
-            changeQuotesButtonVisibility(isVisible = true)
-        }
+        if (initialSanitizedQuote != null) changeQuotesButtonVisibility(isVisible = true)
     }
 
     private suspend fun getExistingDraft(localUuid: String?): Draft? {

From 47fd5881fcfcc375a94314fe93bb047b162618a3 Mon Sep 17 00:00:00 2001
From: Gibran Chevalley <gibran.chevalley@infomaniak.com>
Date: Wed, 1 Apr 2026 15:38:07 +0200
Subject: [PATCH 75/94] refactor: Put back savesnapshot inside common body
 processing and rename method

---
 .../mail/ui/newMessage/NewMessageViewModel.kt      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index 2cd9da5ca13..1e0359f9280 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -334,7 +334,6 @@ class NewMessageViewModel @Inject constructor(
         }.getOrNull()
 
         draft?.let {
-
             it.flagRecipientsAsAutomaticallyEntered()
 
             dismissNotification()
@@ -343,10 +342,7 @@ class NewMessageViewModel @Inject constructor(
             realm.write { DraftController.upsertDraftBlocking(it, realm = this) }
             it.initLiveData(signatures)
 
-            val sanitizedBodyWithQuotes = getBodyAfterCommonProcessing()
-            // We save the initial snapshot with its quotes, because quotes are added during snapshot comparison, ensuring it works
-            // whether the user included them or not.
-            draft.saveSnapshot(sanitizedBodyWithQuotes)
+            processBodyAndInitializeEditorContent(it)
 
             _isShimmering.emit(false)
             initResult.postValue(InitResult(it, signatures))
@@ -355,7 +351,7 @@ class NewMessageViewModel @Inject constructor(
         emit(draft)
     }
 
-    private fun getBodyAfterCommonProcessing(): String {
+    private fun processBodyAndInitializeEditorContent(draft: Draft) {
         val sanitizedBody = initialBody.toSanitizedHtml()
         initEditorElementsVisibility(sanitizedBody)
 
@@ -368,7 +364,11 @@ class NewMessageViewModel @Inject constructor(
          */
         editorBodyInitializer.postValue(sanitizedBodyContentWithoutQuotes)
 
-        return sanitizedBodyWithoutQuotes.mergeWithQuotes(initialSanitizedQuote)
+        val sanitizedBodyWithQuotes = sanitizedBodyWithoutQuotes.mergeWithQuotes(initialSanitizedQuote)
+
+        // We save the initial snapshot with its quotes, because quotes are added during snapshot comparison, ensuring it works
+        // whether the user included them or not.
+        draft.saveSnapshot(sanitizedBodyWithQuotes)
     }
 
     private fun initEditorElementsVisibility(body: String) {

From 0512ae76d45a15d3fff8085b1d742f06f81f769e Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Wed, 1 Apr 2026 17:35:21 +0200
Subject: [PATCH 76/94] refactor: Change javascript bridge name

---
 .../main/java/com/infomaniak/mail/utils/HtmlFormatter.kt    | 4 ++--
 app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt | 6 +++---
 ...cript_bridge.js => message_display_javascript_bridge.js} | 0
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename app/src/main/res/raw/{javascript_bridge.js => message_display_javascript_bridge.js} (100%)

diff --git a/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt b/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
index 80833c7f522..b5264350cd5 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
@@ -245,8 +245,8 @@ class HtmlFormatter(private val html: String) {
             return loadScript(R.raw.fix_email_style)
         }
 
-        fun Context.getJsBridgeScript(): String {
-            return loadScript(R.raw.javascript_bridge)
+        fun Context.getMessageDisplayJavascriptBridge(): String {
+            return loadScript(R.raw.message_display_javascript_bridge)
         }
 
         fun Context.getEditorJsBridgeScript(): String {
diff --git a/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
index 9228f52b238..2add047b50c 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
@@ -31,7 +31,7 @@ import com.infomaniak.mail.utils.HtmlFormatter.Companion.getCustomDarkMode
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getCustomStyle
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getFixStyleScript
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getImproveRenderingStyle
-import com.infomaniak.mail.utils.HtmlFormatter.Companion.getJsBridgeScript
+import com.infomaniak.mail.utils.HtmlFormatter.Companion.getMessageDisplayJavascriptBridge
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getMessageDisplayStyle
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getPrintMailStyle
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getResizeScript
@@ -49,7 +49,7 @@ class WebViewUtils(context: Context) {
 
     private val resizeScript by lazy { context.getResizeScript() }
     private val fixStyleScript by lazy { context.getFixStyleScript() }
-    private val jsBridgeScript by lazy { context.getJsBridgeScript() }
+    private val messageDisplayJsBridgeScript by lazy { context.getMessageDisplayJavascriptBridge() }
 
     fun processHtmlForPrint(
         html: String,
@@ -77,7 +77,7 @@ class WebViewUtils(context: Context) {
         registerMetaViewPort()
         registerScript(resizeScript)
         registerScript(fixStyleScript)
-        registerScript(jsBridgeScript)
+        registerScript(messageDisplayJsBridgeScript)
         registerBodyEncapsulation()
         registerBreakLongWords()
     }
diff --git a/app/src/main/res/raw/javascript_bridge.js b/app/src/main/res/raw/message_display_javascript_bridge.js
similarity index 100%
rename from app/src/main/res/raw/javascript_bridge.js
rename to app/src/main/res/raw/message_display_javascript_bridge.js

From 563cb86b91909560a4f10c4719b1c02781e8eef6 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Wed, 1 Apr 2026 17:36:04 +0200
Subject: [PATCH 77/94] fix: Change mutable map for map

---
 .../mail/ui/main/thread/webViewClient/EditorWebViewClient.kt  | 2 +-
 .../main/thread/webViewClient/MessageDisplayWebViewClient.kt  | 2 +-
 .../mail/ui/main/thread/webViewClient/MessageWebViewClient.kt | 2 +-
 .../java/com/infomaniak/mail/utils/extensions/Extensions.kt   | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/EditorWebViewClient.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/EditorWebViewClient.kt
index bf097abc16d..7fd7f806d94 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/EditorWebViewClient.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/EditorWebViewClient.kt
@@ -23,7 +23,7 @@ import com.infomaniak.mail.data.models.Attachment
 
 class EditorWebViewClient(
     context: Context,
-    cidDictionary: MutableMap<String, Attachment>,
+    cidDictionary: Map<String, Attachment>,
     shouldLoadDistantResources: Boolean,
     private val onPageFinished: () -> Unit,
 ) : MessageWebViewClient(
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageDisplayWebViewClient.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageDisplayWebViewClient.kt
index a2660cfd2b5..d903bc0f0ef 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageDisplayWebViewClient.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageDisplayWebViewClient.kt
@@ -34,7 +34,7 @@ import io.sentry.SentryLevel
 
 class MessageDisplayWebViewClient(
     private val context: Context,
-    cidDictionary: MutableMap<String, Attachment>,
+    cidDictionary: Map<String, Attachment>,
     private val messageUid: String,
     private var shouldLoadDistantResources: Boolean,
     onBlockedResourcesDetected: () -> Unit,
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageWebViewClient.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageWebViewClient.kt
index 9b360ebc7bc..c8268f990ea 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageWebViewClient.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageWebViewClient.kt
@@ -32,7 +32,7 @@ import java.io.ByteArrayInputStream
 
 abstract class MessageWebViewClient(
     private val context: Context,
-    private val cidDictionary: MutableMap<String, Attachment>,
+    private val cidDictionary: Map<String, Attachment>,
     private var shouldLoadDistantResources: Boolean,
     private val onBlockedResourcesDetected: (() -> Unit)? = null,
 ) : WebViewClient() {
diff --git a/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt b/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt
index 441463b00fc..48d57478f39 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt
@@ -311,8 +311,8 @@ fun WebView.initEditorWebviewClient(
     }
 }
 
-private fun List<Attachment>.toCidDictionary(): MutableMap<String, Attachment> {
-    return mutableMapOf<String, Attachment>().apply {
+private fun List<Attachment>.toCidDictionary(): Map<String, Attachment> {
+    return buildMap {
         forEach<Attachment> {
             it.contentId?.let { cid ->
                 if (cid.isNotBlank()) this[cid] = it

From 8adaed2ac070a6c308c895767d9d91eb78ceaa00 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Wed, 1 Apr 2026 17:36:37 +0200
Subject: [PATCH 78/94] refactor: Rename toggle button to show button

---
 .../mail/ui/newMessage/NewMessageFragment.kt           | 10 +++++-----
 .../mail/ui/newMessage/NewMessageViewModel.kt          |  2 +-
 app/src/main/res/layout/fragment_new_message.xml       |  4 ++--
 app/src/main/res/layout/item_message.xml               |  2 +-
 app/src/main/res/values/styles.xml                     |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 66fac5e3f22..2fcdb34333b 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -429,7 +429,7 @@ class NewMessageFragment : Fragment() {
         })
 
         initEditorUi()
-        setupToggleQuotesButton()
+        setupShowQuotesButton()
 
         viewLifecycleOwner.lifecycleScope.launch {
             val mailbox = newMessageViewModel.currentMailbox()
@@ -519,8 +519,8 @@ class NewMessageFragment : Fragment() {
             newMessageViewModel.isShimmering.filterNot { it }
         ) { isQuoteVisible, _ ->
             isQuoteVisible
-        }.collect { isQuoteToggleButtonVisible ->
-            binding.quotesToggleButton.isVisible = isQuoteToggleButtonVisible
+        }.collect { isQuoteButtonVisible ->
+            binding.showQuotesButton.isVisible = isQuoteButtonVisible
         }
     }
 
@@ -538,8 +538,8 @@ class NewMessageFragment : Fragment() {
         }
     }
 
-    private fun setupToggleQuotesButton() {
-        binding.quotesToggleButton.setOnClickListener {
+    private fun setupShowQuotesButton() {
+        binding.showQuotesButton.setOnClickListener {
             newMessageViewModel.changeQuotesButtonVisibility(isVisible = false)
             newMessageViewModel.includeQuotes()
         }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index 1e0359f9280..f8289fd94a0 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -1028,7 +1028,7 @@ class NewMessageViewModel @Inject constructor(
         doc.getElementById(EDITOR_LOCAL_SIGNATURE_ID)?.removeAttr("id")
 
         // If the user deleted the quotes' text, remove the quotes' div so user doesn't write in it
-        // (the text could get hidden later with the toggle button).
+        // (the text could get hidden later with the show quotes button).
         doc.removeEmptyElements(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME)
         doc.removeEmptyElements(MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME)
         return doc.body().html()
diff --git a/app/src/main/res/layout/fragment_new_message.xml b/app/src/main/res/layout/fragment_new_message.xml
index 66208c23dc1..849db3403e1 100644
--- a/app/src/main/res/layout/fragment_new_message.xml
+++ b/app/src/main/res/layout/fragment_new_message.xml
@@ -319,8 +319,8 @@
                         tools:visibility="visible" />
 
                     <com.google.android.material.button.MaterialButton
-                        android:id="@+id/quotesToggleButton"
-                        style="@style/ToggleQuoteTextButton"
+                        android:id="@+id/show_quotes_button"
+                        style="@style/ShowQuoteTextButton"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/messageShowQuotedText"
diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml
index fe592eed8e3..239055cf7c3 100644
--- a/app/src/main/res/layout/item_message.xml
+++ b/app/src/main/res/layout/item_message.xml
@@ -585,7 +585,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/quoteButton"
-                style="@style/ToggleQuoteTextButton"
+                style="@style/ShowQuoteTextButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/messageShowQuotedText" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0d064304101..e0338d75030 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -146,7 +146,7 @@
         <item name="iconPadding">@dimen/marginStandardSmall</item>
     </style>
 
-    <style name="ToggleQuoteTextButton" parent="Widget.Material3.Button.TextButton">
+    <style name="ShowQuoteTextButton" parent="Widget.Material3.Button.TextButton">
         <item name="android:layout_marginBottom">@dimen/marginStandardSmall</item>
         <item name="android:insetLeft">@dimen/alternativeMargin</item>
         <item name="android:insetTop">@dimen/marginStandardVerySmall</item>

From 461d6b4c0f6efa706d23665b4526b18eaf892d8d Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Wed, 1 Apr 2026 17:38:12 +0200
Subject: [PATCH 79/94] refactor: Remove unnecessary comment

---
 .../com/infomaniak/mail/ui/newMessage/EditorContentManager.kt  | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorContentManager.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorContentManager.kt
index 13cb194a5cf..ece1a2968f9 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorContentManager.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/EditorContentManager.kt
@@ -28,9 +28,6 @@ import javax.inject.Inject
 @FragmentScoped
 class EditorContentManager @Inject constructor() {
 
-    /**
-     * @return The html that was processed and inserted inside the editor
-     * */
     fun setContent(editor: RichHtmlEditorWebView, bodyContentPayload: BodyContentPayload) {
         editor.setHtml(bodyContentPayload.toSanitizedHtml())
     }

From f1db35fabf6385d8359aedd2ff4adfedc36244f0 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Wed, 1 Apr 2026 17:39:51 +0200
Subject: [PATCH 80/94] refactor: Remove unnecessary style

---
 .../com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt    | 2 --
 app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt   | 2 --
 app/src/main/res/raw/hide_quotes_style.css                     | 3 ---
 3 files changed, 7 deletions(-)
 delete mode 100644 app/src/main/res/raw/hide_quotes_style.css

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 2fcdb34333b..779a23a12c8 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -94,7 +94,6 @@ import com.infomaniak.mail.utils.HtmlFormatter.Companion.getCustomEditorStyle
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getCustomStyle
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getDeletedInlineImagesObserverScript
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getEditorJsBridgeScript
-import com.infomaniak.mail.utils.HtmlFormatter.Companion.getHideQuotesStyle
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getIncludeQuotesScript
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getReplaceSignatureScript
 import com.infomaniak.mail.utils.MessageBodyUtils.EDITOR_LOCAL_SIGNATURE_ID
@@ -143,7 +142,6 @@ class NewMessageFragment : Fragment() {
     }
     private val replaceSignatureScript by lazy { requireContext().getReplaceSignatureScript() }
     private val showQuotesScript by lazy { requireContext().getIncludeQuotesScript() }
-    private val hideQuotesStyle by lazy { requireContext().getHideQuotesStyle() }
     private val deletedInlineImagesObserverScript by lazy { requireContext().getDeletedInlineImagesObserverScript() }
     private val editorJsBridgeScript by lazy { requireContext().getEditorJsBridgeScript() }
 
diff --git a/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt b/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
index b5264350cd5..82889ddd9e1 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
@@ -233,8 +233,6 @@ class HtmlFormatter(private val html: String) {
             listOf("MESSAGE_SELECTOR" to "#$KMAIL_MESSAGE_ID")
         )
 
-        fun Context.getHideQuotesStyle(): String = loadCss(R.raw.hide_quotes_style)
-
         fun Context.getIncludeQuotesScript(): String = loadScript(R.raw.include_quotes_script)
 
         fun Context.getDeletedInlineImagesObserverScript(): String = loadScript(R.raw.deleted_inline_images_observer)
diff --git a/app/src/main/res/raw/hide_quotes_style.css b/app/src/main/res/raw/hide_quotes_style.css
deleted file mode 100644
index 80ee879896f..00000000000
--- a/app/src/main/res/raw/hide_quotes_style.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.ik_mail_quote, .forwardContentMessage {
-    display: none;
-}

From 5a61c060cd0cae90f2cc358f3818219a8f0518bc Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Wed, 1 Apr 2026 17:42:28 +0200
Subject: [PATCH 81/94] refactor: Rename showQuotesScript to
 includeQuotesScript

---
 .../com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 779a23a12c8..343efe3a4ac 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -141,7 +141,7 @@ class NewMessageFragment : Fragment() {
         requireActivity().intent?.extras?.let(NewMessageActivityArgs::fromBundle) ?: NewMessageActivityArgs()
     }
     private val replaceSignatureScript by lazy { requireContext().getReplaceSignatureScript() }
-    private val showQuotesScript by lazy { requireContext().getIncludeQuotesScript() }
+    private val includeQuotesScript by lazy { requireContext().getIncludeQuotesScript() }
     private val deletedInlineImagesObserverScript by lazy { requireContext().getDeletedInlineImagesObserverScript() }
     private val editorJsBridgeScript by lazy { requireContext().getEditorJsBridgeScript() }
 
@@ -531,7 +531,7 @@ class NewMessageFragment : Fragment() {
     private fun observeQuotesInclusion() = viewLifecycleOwner.lifecycleScope.launch {
         for (quote in newMessageViewModel.quotesToIncludeChannel) {
             val escapedQuote = looselyEscapeAsStringLiteralForJs(quote)
-            val includeQuoteScript = showQuotesScript.format(escapedQuote)
+            val includeQuoteScript = includeQuotesScript.format(escapedQuote)
             binding.editorWebView.evaluateJavascript(includeQuoteScript, null)
         }
     }

From ad4ddcabad7adfd26d511e628b544c2f15e94b73 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Wed, 1 Apr 2026 17:49:32 +0200
Subject: [PATCH 82/94] refactor: Refactor functions names, remove unnecessary
 is empty check and remove empty spaces

---
 .../mail/ui/newMessage/NewMessageFragment.kt          | 11 +++++------
 .../mail/ui/newMessage/NewMessageViewModel.kt         | 11 ++++-------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 343efe3a4ac..db1208cb0f0 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -468,7 +468,7 @@ class NewMessageFragment : Fragment() {
         isEditorWebViewFocusedLiveData.observe(viewLifecycleOwner) { isFocused ->
             setToolbarEnabledStatus(isFocused)
             if (isFocused && isPlaceHolderVisible.value) {
-                changePlaceholderVisibility(isVisible = false)
+                setPlaceholderVisibility(isVisible = false)
             }
         }
     }
@@ -538,12 +538,11 @@ class NewMessageFragment : Fragment() {
 
     private fun setupShowQuotesButton() {
         binding.showQuotesButton.setOnClickListener {
-            newMessageViewModel.changeQuotesButtonVisibility(isVisible = false)
+            newMessageViewModel.setQuotesButtonVisibility(isVisible = false)
             newMessageViewModel.includeQuotes()
         }
     }
 
-
     private fun setupFromField(signatures: List<Signature>) = with(binding) {
 
         signatureAdapter.setList(signatures)
@@ -722,9 +721,9 @@ class NewMessageFragment : Fragment() {
         }
     }
 
-    private fun observeBodyLoader() = with(newMessageViewModel) {
-        editorBodyInitializer.observe(viewLifecycleOwner) { bodyContentData ->
-            editorContentManager.setContent(binding.editorWebView, bodyContentData)
+    private fun observeBodyLoader() {
+        newMessageViewModel.editorBodyInitializer.observe(viewLifecycleOwner) { body ->
+            editorContentManager.setContent(binding.editorWebView, body)
         }
     }
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index f8289fd94a0..ffb8ebd37a6 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -372,8 +372,8 @@ class NewMessageViewModel @Inject constructor(
     }
 
     private fun initEditorElementsVisibility(body: String) {
-        changePlaceholderVisibility(isVisible = body.isHtmlBlank())
-        if (initialSanitizedQuote != null) changeQuotesButtonVisibility(isVisible = true)
+        setPlaceholderVisibility(isVisible = body.isHtmlBlank())
+        if (initialSanitizedQuote != null) setQuotesButtonVisibility(isVisible = true)
     }
 
     private suspend fun getExistingDraft(localUuid: String?): Draft? {
@@ -390,8 +390,6 @@ class NewMessageViewModel @Inject constructor(
 
             val doc = jsoupParseWithLog(draft.body)
 
-            // This is only used for existing drafts, for new drafts we add the signature id during the signature encapsulation.
-            // We added this here to avoid an extra parse.
             if (!isNewMessage) {
                 doc.getElementsByClass(INFOMANIAK_SIGNATURE_HTML_CLASS_NAME).attr("id", EDITOR_LOCAL_SIGNATURE_ID)
             }
@@ -578,7 +576,7 @@ class NewMessageViewModel @Inject constructor(
         isEncryptionActivated.postValue(isEncrypted)
     }
 
-    fun changeQuotesButtonVisibility(isVisible: Boolean) {
+    fun setQuotesButtonVisibility(isVisible: Boolean) {
         _isQuotesButtonVisible.value = isVisible
     }
 
@@ -587,7 +585,7 @@ class NewMessageViewModel @Inject constructor(
         areQuotesIncluded = true
     }
 
-    fun changePlaceholderVisibility(isVisible: Boolean) {
+    fun setPlaceholderVisibility(isVisible: Boolean) {
         _isPlaceHolderVisible.value = isVisible
     }
 
@@ -1036,7 +1034,6 @@ class NewMessageViewModel @Inject constructor(
 
     private fun Document.removeEmptyElements(className: String) {
         val elements = getElementsByClass(className)
-        if (elements.isEmpty()) return
         elements.forEach { if (it.text().isEmpty()) it.remove() }
     }
 

From 61f9181ef7825ac08f9b1cb599d2f34c32a6cf12 Mon Sep 17 00:00:00 2001
From: Gibran Chevalley <gibran.chevalley@infomaniak.com>
Date: Thu, 2 Apr 2026 09:38:20 +0200
Subject: [PATCH 83/94] docs: Explain why we need normalizeCarriageReturns

---
 .../com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index ffb8ebd37a6..be1e4d37447 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -546,6 +546,10 @@ class NewMessageViewModel @Inject constructor(
         )
     }
 
+    /**
+     * The editor will always export code with `\n` even when we provided `\r\n` as input. To not fail snapshot comparison, we
+     * need to make sure we save the snapshots with `\n` only.
+     */
     private fun String.normalizeCarriageReturns(): String {
         return replace("\r\n", "\n")
     }

From 7aeffe7045cb5009264c795d05f945bee83e2e04 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Thu, 2 Apr 2026 11:32:40 +0200
Subject: [PATCH 84/94] fix: Unnecessary new message check

---
 .../com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index be1e4d37447..e08d85ac79c 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -389,10 +389,7 @@ class NewMessageViewModel @Inject constructor(
             }
 
             val doc = jsoupParseWithLog(draft.body)
-
-            if (!isNewMessage) {
-                doc.getElementsByClass(INFOMANIAK_SIGNATURE_HTML_CLASS_NAME).attr("id", EDITOR_LOCAL_SIGNATURE_ID)
-            }
+            doc.getElementsByClass(INFOMANIAK_SIGNATURE_HTML_CLASS_NAME).attr("id", EDITOR_LOCAL_SIGNATURE_ID)
 
             val (body, signature, quote) = splitSignatureAndQuoteFromBody(draft)
             initialBody = body

From 15b7660f3bec3ab76c2c6f06b3c1a18310bdf932 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Tue, 14 Apr 2026 17:13:29 +0200
Subject: [PATCH 85/94] fix: Fix editor when the email is generated by Euria

---
 .../webViewClient/EditorWebViewClient.kt      |  1 -
 .../mail/ui/newMessage/AiPromptFragment.kt    |  4 +-
 .../mail/ui/newMessage/NewMessageAiManager.kt | 39 ++++++++++++---
 .../mail/ui/newMessage/NewMessageFragment.kt  | 21 ++++++++-
 .../infomaniak/mail/utils/HtmlFormatter.kt    |  8 ++++
 .../com/infomaniak/mail/utils/WebViewUtils.kt |  8 ++++
 .../res/raw/check_is_editor_body_empty.js     | 28 +++++++++++
 app/src/main/res/raw/set_ai_content_script.js | 47 +++++++++++++++++++
 8 files changed, 147 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/res/raw/check_is_editor_body_empty.js
 create mode 100644 app/src/main/res/raw/set_ai_content_script.js

diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/EditorWebViewClient.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/EditorWebViewClient.kt
index 7fd7f806d94..320272323f2 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/EditorWebViewClient.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/EditorWebViewClient.kt
@@ -32,7 +32,6 @@ class EditorWebViewClient(
     shouldLoadDistantResources,
 ) {
     override fun onPageFinished(webView: WebView, url: String?) {
-        webView.evaluateJavascript("removeAllProperties()", null)
         onPageFinished()
     }
 }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/AiPromptFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/AiPromptFragment.kt
index c5fb816ba9a..20d93d62543 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/AiPromptFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/AiPromptFragment.kt
@@ -92,7 +92,9 @@ class AiPromptFragment : Fragment() {
         closeButton.setOnClickListener { newMessageFragment.closeAiPrompt() }
 
         generateButton.setOnClickListener {
-            newMessageFragment.navigateToPropositionFragment()
+            viewLifecycleOwner.lifecycleScope.launch {
+                newMessageFragment.navigateToPropositionFragment()
+            }
         }
 
         // When the app is recreated or the prompt is opened when coming back from AiPropositionFragment,
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageAiManager.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageAiManager.kt
index d07c8e434b1..04041075afd 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageAiManager.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageAiManager.kt
@@ -32,6 +32,7 @@ import androidx.lifecycle.lifecycleScope
 import com.infomaniak.core.ksuite.data.KSuite
 import com.infomaniak.core.legacy.utils.hideKeyboard
 import com.infomaniak.core.legacy.utils.safeNavigate
+import com.infomaniak.lib.richhtmleditor.executor.JsExecutableMethod
 import com.infomaniak.mail.MatomoMail.MatomoName
 import com.infomaniak.mail.MatomoMail.trackAiWriterEvent
 import com.infomaniak.mail.R
@@ -39,6 +40,12 @@ import com.infomaniak.mail.data.LocalSettings
 import com.infomaniak.mail.data.models.FeatureFlag
 import com.infomaniak.mail.data.models.ai.AiPromptOpeningStatus
 import com.infomaniak.mail.databinding.FragmentNewMessageBinding
+import com.infomaniak.mail.ui.newMessage.EditorContentManager.Companion.toSanitizedHtml
+import com.infomaniak.mail.utils.HtmlFormatter.Companion.getCheckIsEditorBodyEmptyScript
+import com.infomaniak.mail.utils.MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME
+import com.infomaniak.mail.utils.MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME
+import com.infomaniak.mail.utils.MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_CLASS_NAME
+import com.infomaniak.mail.utils.WebViewUtils.Companion.evaluateJs
 import com.infomaniak.mail.utils.openKSuiteProBottomSheet
 import com.infomaniak.mail.utils.openMailPremiumBottomSheet
 import com.infomaniak.mail.utils.openMyKSuiteUpgradeBottomSheet
@@ -55,7 +62,6 @@ import com.infomaniak.core.legacy.R as RCore
 @FragmentScoped
 class NewMessageAiManager @Inject constructor(
     @ActivityContext private val activityContext: Context,
-    private val editorContentManager: EditorContentManager,
     private val localSettings: LocalSettings,
 ) : NewMessageManager() {
 
@@ -67,6 +73,7 @@ class NewMessageAiManager @Inject constructor(
     private val animationDuration by lazy { resources.getInteger(R.integer.aiPromptAnimationDuration).toLong() }
     private val scrimOpacity by lazy { ResourcesCompat.getFloat(context.resources, R.dimen.scrimOpacity) }
     private val black by lazy { context.getColor(RCore.color.black) }
+    private val checkIsEditorBodyEmptyScript by lazy { activityContext.getCheckIsEditorBodyEmptyScript() }
 
     private var aiPromptFragment: AiPromptFragment? = null
 
@@ -94,8 +101,18 @@ class NewMessageAiManager @Inject constructor(
 
     fun observeAiOutput() = with(binding) {
         aiViewModel.aiOutputToInsert.observe(viewLifecycleOwner) { (subject, content) ->
+            newMessageViewModel.setPlaceholderVisibility(false)
             subject?.let(subjectTextField::setText)
-            editorContentManager.setContent(editorWebView, BodyContentPayload(content, BodyContentType.TEXT_PLAIN_WITH_HTML))
+            setAiContent(content)
+        }
+    }
+
+    private fun setAiContent(content: String) {
+        val bodyContent = BodyContentPayload(content, BodyContentType.TEXT_PLAIN_WITH_HTML)
+        val sanitizedContent = bodyContent.toSanitizedHtml()
+
+        viewLifecycleOwner.lifecycleScope.launch {
+            binding.editorWebView.executeJsMethodWhenEditorIsSetup(JsExecutableMethod("setAiOutputContent", sanitizedContent))
         }
     }
 
@@ -207,15 +224,25 @@ class NewMessageAiManager @Inject constructor(
         }
     }
 
-    fun navigateToPropositionFragment() {
-
+    suspend fun navigateToPropositionFragment() {
+        calculateAiPropositionData()
         closeAiPrompt(becauseOfGeneration = true)
         resetAiProposition()
+    }
+
+    private suspend fun calculateAiPropositionData() {
+        val isSubjectBlank = fragment.isSubjectBlank()
+        val formattedScript = checkIsEditorBodyEmptyScript.format(
+            INFOMANIAK_SIGNATURE_HTML_CLASS_NAME,
+            INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME,
+            INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME,
+        )
 
+        val isBodyBlank = binding.editorWebView.evaluateJs(formattedScript) == "true"
         fragment.safeNavigate(
             NewMessageFragmentDirections.actionNewMessageFragmentToAiPropositionFragment(
-                isSubjectBlank = fragment.isSubjectBlank(),
-                isBodyBlank = binding.editorWebView.isEmptyFlow.value ?: true,
+                isSubjectBlank = isSubjectBlank,
+                isBodyBlank = isBodyBlank,
             ),
         )
     }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index db1208cb0f0..6bf39a549b9 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -58,6 +58,7 @@ import com.infomaniak.lib.richhtmleditor.StatusCommand.ITALIC
 import com.infomaniak.lib.richhtmleditor.StatusCommand.STRIKE_THROUGH
 import com.infomaniak.lib.richhtmleditor.StatusCommand.UNDERLINE
 import com.infomaniak.lib.richhtmleditor.StatusCommand.UNORDERED_LIST
+import com.infomaniak.lib.richhtmleditor.executor.JsExecutableMethod
 import com.infomaniak.lib.richhtmleditor.looselyEscapeAsStringLiteralForJs
 import com.infomaniak.mail.MatomoMail.MatomoName
 import com.infomaniak.mail.MatomoMail.trackAttachmentActionsEvent
@@ -94,11 +95,14 @@ import com.infomaniak.mail.utils.HtmlFormatter.Companion.getCustomEditorStyle
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getCustomStyle
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getDeletedInlineImagesObserverScript
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getEditorJsBridgeScript
+import com.infomaniak.mail.utils.HtmlFormatter.Companion.getFixStyleScript
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getIncludeQuotesScript
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getReplaceSignatureScript
+import com.infomaniak.mail.utils.HtmlFormatter.Companion.getSetAiContentScript
 import com.infomaniak.mail.utils.MessageBodyUtils.EDITOR_LOCAL_SIGNATURE_ID
 import com.infomaniak.mail.utils.MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME
 import com.infomaniak.mail.utils.MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME
+import com.infomaniak.mail.utils.MessageBodyUtils.INFOMANIAK_SIGNATURE_HTML_CLASS_NAME
 import com.infomaniak.mail.utils.SentryDebug
 import com.infomaniak.mail.utils.SignatureUtils
 import com.infomaniak.mail.utils.WebViewUtils.Companion.setupNewMessageWebViewSettings
@@ -144,6 +148,8 @@ class NewMessageFragment : Fragment() {
     private val includeQuotesScript by lazy { requireContext().getIncludeQuotesScript() }
     private val deletedInlineImagesObserverScript by lazy { requireContext().getDeletedInlineImagesObserverScript() }
     private val editorJsBridgeScript by lazy { requireContext().getEditorJsBridgeScript() }
+    private val fixStyle by lazy { requireContext().getFixStyleScript() }
+    private val setAiContentScript by lazy { requireContext().getSetAiContentScript() }
 
     private val newMessageFragmentArgs: NewMessageFragmentArgs by navArgs()
     private val newMessageViewModel: NewMessageViewModel by activityViewModels()
@@ -449,6 +455,7 @@ class NewMessageFragment : Fragment() {
         setEditorScript()
         editorAiAnimation.setAnimation(R.raw.euria)
         setToolbarEnabledStatus(false)
+        removeAllProperties()
         handleFocusChanges()
     }
 
@@ -460,8 +467,20 @@ class NewMessageFragment : Fragment() {
     }
 
     private fun setEditorScript() = with(binding.editorWebView) {
+        addScript(fixStyle)
         addScript(editorJsBridgeScript)
         addScript(deletedInlineImagesObserverScript)
+
+        val formattedAiContentScript = setAiContentScript.format(
+            INFOMANIAK_SIGNATURE_HTML_CLASS_NAME,
+            INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME,
+            INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME
+        )
+        addScript(formattedAiContentScript)
+    }
+
+    private fun removeAllProperties() = viewLifecycleOwner.lifecycleScope.launch {
+        binding.editorWebView.executeJsMethodWhenEditorIsSetup(JsExecutableMethod("removeAllProperties"))
     }
 
     private fun handleFocusChanges() = with(newMessageViewModel) {
@@ -856,7 +875,7 @@ class NewMessageFragment : Fragment() {
         if (isTaskRoot) finishAndRemoveTask() else finish()
     }
 
-    fun navigateToPropositionFragment() = aiManager.navigateToPropositionFragment()
+    suspend fun navigateToPropositionFragment() = aiManager.navigateToPropositionFragment()
 
     fun closeAiPrompt() = aiManager.closeAiPrompt()
 
diff --git a/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt b/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
index 82889ddd9e1..0960462b487 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt
@@ -250,5 +250,13 @@ class HtmlFormatter(private val html: String) {
         fun Context.getEditorJsBridgeScript(): String {
             return loadScript(R.raw.editor_javascript_bridge)
         }
+
+        fun Context.getCheckIsEditorBodyEmptyScript(): String {
+            return loadScript(R.raw.check_is_editor_body_empty)
+        }
+
+        fun Context.getSetAiContentScript(): String {
+            return loadScript(R.raw.set_ai_content_script)
+        }
     }
 }
diff --git a/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
index 2add047b50c..5dede462ae7 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/WebViewUtils.kt
@@ -37,6 +37,8 @@ import com.infomaniak.mail.utils.HtmlFormatter.Companion.getPrintMailStyle
 import com.infomaniak.mail.utils.HtmlFormatter.Companion.getResizeScript
 import com.infomaniak.mail.utils.extensions.enableAlgorithmicDarkening
 import com.infomaniak.mail.utils.extensions.loadCss
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlin.coroutines.resume
 import kotlin.math.abs
 
 class WebViewUtils(context: Context) {
@@ -138,6 +140,12 @@ class WebViewUtils(context: Context) {
             evaluateJavascript(removeBackgroundStyleScript, null)
         }
 
+        suspend fun WebView.evaluateJs(script: String): String = suspendCancellableCoroutine { continuation ->
+            evaluateJavascript(script) {
+                continuation.resume(it)
+            }
+        }
+
         /**
          * Lets the WebView take the zoom gestures and lets the WebView handle scrolls that start horizontally while letting the
          * parent handle scrolls that start vertically. This is not perfect but the best solution is way more complex.
diff --git a/app/src/main/res/raw/check_is_editor_body_empty.js b/app/src/main/res/raw/check_is_editor_body_empty.js
new file mode 100644
index 00000000000..0bed11a7d35
--- /dev/null
+++ b/app/src/main/res/raw/check_is_editor_body_empty.js
@@ -0,0 +1,28 @@
+/*
+ * Infomaniak Mail - Android
+ * Copyright (C) 2026 Infomaniak Network SA
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+(function() {
+    const body = getEditor();
+    // We will clone the body so we don't modify the original HTML.
+    const clonedBody = body.cloneNode(true);
+
+    const elements = clonedBody.querySelectorAll(".%s, .%s, .%s");
+    elements.forEach( element => { element.remove(); });
+
+    return clonedBody.innerText.trim().length === 0;
+})()
diff --git a/app/src/main/res/raw/set_ai_content_script.js b/app/src/main/res/raw/set_ai_content_script.js
new file mode 100644
index 00000000000..63f14e33414
--- /dev/null
+++ b/app/src/main/res/raw/set_ai_content_script.js
@@ -0,0 +1,47 @@
+/*
+* Infomaniak Mail - Android
+* Copyright (C) 2026 Infomaniak Network SA
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+var savedElements = [];
+
+function extractElements() {
+    const elements = document.querySelectorAll(".%s, .%s, .%s");
+    elements.forEach( element => {
+        savedElements.push(element.cloneNode(true));
+        element.remove();
+    });
+}
+
+function clearRemainingContent() {
+    var body = getEditor();
+    while (body.firstChild) {
+        body.removeChild(body.firstChild);
+    }
+}
+
+function rebuildBody(aiContent) {
+    getEditor().insertAdjacentHTML('beforeEnd', aiContent);
+    savedElements.forEach(quote => {
+       getEditor().appendChild(quote);
+    })
+}
+
+function setAiOutputContent(aiContent) {
+    extractElements();
+    clearRemainingContent();
+    rebuildBody(aiContent);
+}

From e1bab45b0b5eb03d915908132ee3238308afa88e Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Wed, 15 Apr 2026 08:54:46 +0200
Subject: [PATCH 86/94] fix: Fix sonar recommendations in js script

---
 app/src/main/res/raw/set_ai_content_script.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/raw/set_ai_content_script.js b/app/src/main/res/raw/set_ai_content_script.js
index 63f14e33414..b8d33dee0d8 100644
--- a/app/src/main/res/raw/set_ai_content_script.js
+++ b/app/src/main/res/raw/set_ai_content_script.js
@@ -16,7 +16,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-var savedElements = [];
+let savedElements = [];
 
 function extractElements() {
     const elements = document.querySelectorAll(".%s, .%s, .%s");
@@ -27,9 +27,9 @@ function extractElements() {
 }
 
 function clearRemainingContent() {
-    var body = getEditor();
+    const body = getEditor();
     while (body.firstChild) {
-        body.removeChild(body.firstChild);
+        body.firstChild.remove()
     }
 }
 

From 97f958bc88fe2ea073e7e43c0416a2a9685f865e Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Thu, 23 Apr 2026 16:48:43 +0200
Subject: [PATCH 87/94] feat: Add Matomo for when the user clicks on showQuote
 button

---
 app/src/main/java/com/infomaniak/mail/MatomoMail.kt              | 1 +
 .../java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/src/main/java/com/infomaniak/mail/MatomoMail.kt b/app/src/main/java/com/infomaniak/mail/MatomoMail.kt
index b252e136692..7084a1bccc1 100644
--- a/app/src/main/java/com/infomaniak/mail/MatomoMail.kt
+++ b/app/src/main/java/com/infomaniak/mail/MatomoMail.kt
@@ -148,6 +148,7 @@ object MatomoMail : Matomo {
         DeleteDraft("deleteDraft"),
         DeleteExecuted("deleteExecuted"),
         DeleteFromHistory("deleteFromHistory"),
+        ShowQuote("showQuote"),
         DeleteQuote("deleteQuote"),
         DeleteRecipient("deleteRecipient"),
         DeleteSearch("deleteSearch"),
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index 6bf39a549b9..2614d721abd 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -557,6 +557,7 @@ class NewMessageFragment : Fragment() {
 
     private fun setupShowQuotesButton() {
         binding.showQuotesButton.setOnClickListener {
+            trackNewMessageEvent(MatomoName.ShowQuote)
             newMessageViewModel.setQuotesButtonVisibility(isVisible = false)
             newMessageViewModel.includeQuotes()
         }

From d5b2d2a2a7a7012c04191c04a22c6166ac09d741 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Fri, 24 Apr 2026 11:19:44 +0200
Subject: [PATCH 88/94] fix: JS string literal shouldnt be wrapped in quotes

---
 .../ui/main/thread/webViewClient/MessageDisplayWebViewClient.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageDisplayWebViewClient.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageDisplayWebViewClient.kt
index d903bc0f0ef..78f97153ca7 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageDisplayWebViewClient.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageDisplayWebViewClient.kt
@@ -87,7 +87,7 @@ class MessageDisplayWebViewClient(
                 }
             }
             val escapedMessageUid = looselyEscapeAsStringLiteralForJs(messageUid)
-            webView.loadUrl("javascript:removeAllProperties(); normalizeMessageWidth($widthInDp, '$escapedMessageUid')")
+            webView.loadUrl("javascript:removeAllProperties(); normalizeMessageWidth($widthInDp, $escapedMessageUid)")
             onPageFinished?.invoke()
         }
     }

From d84a35f2c072e9c5bfa1b5f2c5bfe5d48bb720ef Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Fri, 24 Apr 2026 12:59:55 +0200
Subject: [PATCH 89/94] refactor: Move BodyData class to MessageBodyUtils

---
 .../com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt   | 2 --
 .../main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt    | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index e08d85ac79c..b58bd6f9280 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -1183,8 +1183,6 @@ class NewMessageViewModel @Inject constructor(
 
     private data class SubjectAndBodyData(val subject: String, val body: String, val expirationId: Int)
 
-    data class BodyData(val body: BodyContentPayload, val signature: String?, val quote: String?)
-
     companion object {
         private val TAG = NewMessageViewModel::class.java.simpleName
 
diff --git a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
index 10df1e5e188..f8ed420cb25 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
@@ -24,7 +24,6 @@ import com.infomaniak.mail.data.models.message.Message
 import com.infomaniak.mail.data.models.message.SubBody
 import com.infomaniak.mail.ui.newMessage.BodyContentPayload
 import com.infomaniak.mail.ui.newMessage.BodyContentType
-import com.infomaniak.mail.ui.newMessage.NewMessageViewModel.BodyData
 import com.infomaniak.mail.utils.JsoupParserUtil.jsoupParseWithLog
 import com.infomaniak.mail.utils.JsoupParserUtil.measureAndLogMemoryUsage
 import com.infomaniak.mail.utils.PrintHeaderUtils.createPrintHeader
@@ -229,4 +228,6 @@ object MessageBodyUtils {
 
         override fun hashCode(): Int = 31 * content.hashCode() + quote.hashCode()
     }
+
+    data class BodyData(val body: BodyContentPayload, val signature: String?, val quote: String?)
 }

From 8f75fc3f92d08cd09704aec2a482007197855a1e Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Fri, 24 Apr 2026 13:31:54 +0200
Subject: [PATCH 90/94] fix: Don't duplicate shouldLoadResources in
 MessageDisplayWebViewClient

---
 .../thread/webViewClient/MessageDisplayWebViewClient.kt    | 2 +-
 .../ui/main/thread/webViewClient/MessageWebViewClient.kt   | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageDisplayWebViewClient.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageDisplayWebViewClient.kt
index 78f97153ca7..07554f1d5d7 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageDisplayWebViewClient.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageDisplayWebViewClient.kt
@@ -36,7 +36,7 @@ class MessageDisplayWebViewClient(
     private val context: Context,
     cidDictionary: Map<String, Attachment>,
     private val messageUid: String,
-    private var shouldLoadDistantResources: Boolean,
+    shouldLoadDistantResources: Boolean,
     onBlockedResourcesDetected: () -> Unit,
     private val navigateToNewMessageActivity: ((Uri) -> Unit)?,
     private val onPageFinished: (() -> Unit)?,
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageWebViewClient.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageWebViewClient.kt
index c8268f990ea..2e8c55f878e 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageWebViewClient.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/webViewClient/MessageWebViewClient.kt
@@ -33,9 +33,10 @@ import java.io.ByteArrayInputStream
 abstract class MessageWebViewClient(
     private val context: Context,
     private val cidDictionary: Map<String, Attachment>,
-    private var shouldLoadDistantResources: Boolean,
+    private var _shouldLoadDistantResources: Boolean,
     private val onBlockedResourcesDetected: (() -> Unit)? = null,
 ) : WebViewClient() {
+    val shouldLoadDistantResources get() = _shouldLoadDistantResources
 
     private val emptyResource by lazy { WebResourceResponse("text/plain", "utf-8", ByteArrayInputStream(ByteArray(0))) }
 
@@ -63,7 +64,7 @@ abstract class MessageWebViewClient(
             } ?: emptyResource
         }
 
-        val shouldLoadResource = shouldLoadDistantResources
+        val shouldLoadResource = _shouldLoadDistantResources
                 || url?.scheme.equals(DATA_SCHEME, ignoreCase = true)
                 || trustedUrls.any { it.find(url.toString()) != null }
 
@@ -76,7 +77,7 @@ abstract class MessageWebViewClient(
     }.getOrDefault(super.shouldInterceptRequest(view, request))
 
     fun unblockDistantResources() {
-        shouldLoadDistantResources = true
+        _shouldLoadDistantResources = true
     }
 
     companion object {

From 0608720d855a34fe8a28cf3c328829431a300454 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Mon, 27 Apr 2026 13:26:38 +0200
Subject: [PATCH 91/94] chore: Update richHtmlEditor library

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index bc52d6065da..386516256b1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -20,7 +20,7 @@ mockk = "1.14.6"
 orchestrator = "1.6.1"
 playServices = "18.9.0"
 realmKotlin = "3.2.8-2"
-richHtmlEditor = "1.0.0"
+richHtmlEditor = "1.1.0"
 uiautomator = "2.3.0"
 uiTestJunit4 = "1.10.0"
 webkit = "1.14.0"

From 3b5b9eb225bb45e05e70ed4bd269a4c4c18f7ecd Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Mon, 27 Apr 2026 14:44:04 +0200
Subject: [PATCH 92/94] fix: Add signature local id after split

---
 .../mail/ui/newMessage/NewMessageViewModel.kt          | 10 +++++-----
 .../java/com/infomaniak/mail/utils/MessageBodyUtils.kt |  9 ++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index b58bd6f9280..175d4b2d030 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -388,13 +388,13 @@ class NewMessageViewModel @Inject constructor(
                 draft.identityId = currentMailbox().getDefaultSignatureWithFallback().id.toString()
             }
 
-            val doc = jsoupParseWithLog(draft.body)
-            doc.getElementsByClass(INFOMANIAK_SIGNATURE_HTML_CLASS_NAME).attr("id", EDITOR_LOCAL_SIGNATURE_ID)
-
             val (body, signature, quote) = splitSignatureAndQuoteFromBody(draft)
             initialBody = body
-            initialSignature = signature?.let { BodyContentPayload(it, BodyContentType.HTML_UNSANITIZED) }
-            initialSanitizedQuote = quote?.sanitize()
+            if (signature != null) {
+                signature.getElementsByClass(INFOMANIAK_SIGNATURE_HTML_CLASS_NAME).attr("id", EDITOR_LOCAL_SIGNATURE_ID)
+                initialSignature = BodyContentPayload(signature.outerHtml(), BodyContentType.HTML_UNSANITIZED)
+            }
+            initialSanitizedQuote = quote?.outerHtml()?.sanitize()
 
             return draft
         }
diff --git a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
index f8ed420cb25..08d2ff390ce 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/MessageBodyUtils.kt
@@ -135,16 +135,15 @@ object MessageBodyUtils {
      */
     fun splitSignatureAndQuoteFromHtml(document: Document): BodyData {
 
-        fun Document.split(divClassName: String, defaultValue: Element): Pair<Element, String?> {
+        fun Document.split(divClassName: String, defaultValue: Element): Pair<Element, Element?> {
             // We need to use select and not getElementByClass because getElementByClass adds a \n after every <br>.
             // The function remove() also adds \n after each <br> of it.
             // So we need to use select, save the second part of the split first, and then do remove, to save the correct value
             // for the snapshot to compare.
             return select(".$divClassName").firstOrNull()?.let {
-                val second = if (it.html().isBlank()) null else it.outerHtml()
+                val second = if (it.html().isBlank()) null else it
                 it.remove()
-                val first = body()
-                first to second
+                document to second
             } ?: (defaultValue to null)
         }
 
@@ -229,5 +228,5 @@ object MessageBodyUtils {
         override fun hashCode(): Int = 31 * content.hashCode() + quote.hashCode()
     }
 
-    data class BodyData(val body: BodyContentPayload, val signature: String?, val quote: String?)
+    data class BodyData(val body: BodyContentPayload, val signature: Element?, val quote: Element?)
 }

From efbcc8a9d97901aa52b38b8aa0921d0191224628 Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Mon, 27 Apr 2026 15:13:38 +0200
Subject: [PATCH 93/94] fix: Send saved elements as parameters in ai script

---
 app/src/main/res/raw/set_ai_content_script.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/raw/set_ai_content_script.js b/app/src/main/res/raw/set_ai_content_script.js
index b8d33dee0d8..efe6ee65627 100644
--- a/app/src/main/res/raw/set_ai_content_script.js
+++ b/app/src/main/res/raw/set_ai_content_script.js
@@ -16,14 +16,14 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-let savedElements = [];
-
 function extractElements() {
+    let savedElements = [];
     const elements = document.querySelectorAll(".%s, .%s, .%s");
     elements.forEach( element => {
         savedElements.push(element.cloneNode(true));
         element.remove();
     });
+    return savedElements;
 }
 
 function clearRemainingContent() {
@@ -33,7 +33,7 @@ function clearRemainingContent() {
     }
 }
 
-function rebuildBody(aiContent) {
+function rebuildBody(aiContent, savedElements) {
     getEditor().insertAdjacentHTML('beforeEnd', aiContent);
     savedElements.forEach(quote => {
        getEditor().appendChild(quote);
@@ -41,7 +41,7 @@ function rebuildBody(aiContent) {
 }
 
 function setAiOutputContent(aiContent) {
-    extractElements();
+    let savedElements = extractElements();
     clearRemainingContent();
-    rebuildBody(aiContent);
+    rebuildBody(aiContent, savedElements);
 }

From 2f82790afc0378ea50e7f8ae186d68e91365546b Mon Sep 17 00:00:00 2001
From: Sol Rubado <sol.rubado@infomaniak.com>
Date: Mon, 27 Apr 2026 16:08:26 +0200
Subject: [PATCH 94/94] fix: Return all html after removing unwanted html

---
 .../com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
index 175d4b2d030..a89d11d1a5a 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -1030,7 +1030,7 @@ class NewMessageViewModel @Inject constructor(
         // (the text could get hidden later with the show quotes button).
         doc.removeEmptyElements(MessageBodyUtils.INFOMANIAK_REPLY_QUOTE_HTML_CLASS_NAME)
         doc.removeEmptyElements(MessageBodyUtils.INFOMANIAK_FORWARD_QUOTE_HTML_CLASS_NAME)
-        return doc.body().html()
+        return doc.html()
     }
 
     private fun Document.removeEmptyElements(className: String) {