From e0135da65ac7ed0a9dba1c07b1cf7d7f09a2bc88 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Fri, 15 Apr 2022 13:42:48 +0300
Subject: [PATCH] Improve HTML detection from templates

---
 lib/ui/app/invoice/invoice_email_view.dart   | 2 +-
 lib/ui/settings/templates_and_reminders.dart | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/ui/app/invoice/invoice_email_view.dart b/lib/ui/app/invoice/invoice_email_view.dart
index 3bc7608f4..0098e23c4 100644
--- a/lib/ui/app/invoice/invoice_email_view.dart
+++ b/lib/ui/app/invoice/invoice_email_view.dart
@@ -155,7 +155,7 @@ class _InvoiceEmailViewState extends State<InvoiceEmailView>
               final company = widget.viewModel.state.company;
               if (company.markdownEmailEnabled &&
                   widget.viewModel.state.prefState.isDesktop &&
-                  _rawBodyPreview.startsWith('<p>')) {
+                  _rawBodyPreview.trim().startsWith('<')) {
                 _rawBodyPreview = html2md.convert(_rawBodyPreview);
               }
             }
diff --git a/lib/ui/settings/templates_and_reminders.dart b/lib/ui/settings/templates_and_reminders.dart
index 3da93b5a7..c9fb738c2 100644
--- a/lib/ui/settings/templates_and_reminders.dart
+++ b/lib/ui/settings/templates_and_reminders.dart
@@ -147,7 +147,7 @@ class _TemplatesAndRemindersState extends State<TemplatesAndReminders>
 
     if (viewModel.state.company.markdownEmailEnabled &&
         widget.viewModel.state.prefState.isDesktop &&
-        _bodyController.text.startsWith('<p>')) {
+        _bodyController.text.trim().startsWith('<')) {
       _bodyController.text = html2md.convert(_bodyController.text);
     }
 
@@ -164,7 +164,7 @@ class _TemplatesAndRemindersState extends State<TemplatesAndReminders>
 
       if (state.company.markdownEmailEnabled &&
           widget.viewModel.state.prefState.isDesktop &&
-          _defaultBody.startsWith('<p>')) {
+          _defaultBody.trim().startsWith('<')) {
         _defaultBody = html2md.convert(_defaultBody);
       }
     });