Fix HTML handling when switching from plain text to HTML mode

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

2 files changed, 3 insertions, 3 deletions

diff --git a/src/components/Composer.vue b/src/components/Composer.vue
index 66f09920e..118759aec 100644
--- a/src/components/Composer.vue
+++ b/src/components/Composer.vue
@@ -177,10 +177,10 @@ import Vue from 'vue'
 
 import ComposerAttachments from './ComposerAttachments'
 import {findRecipient} from '../service/AutocompleteService'
+import {htmlToText, textToSimpleHtml} from '../util/HtmlHelper'
 import Loading from './Loading'
 import Logger from '../logger'
 import TextEditor from './TextEditor'
-import {textToSimpleHtml} from '../util/HtmlHelper'
 
 const debouncedSearch = debouncePromise(findRecipient, 500)
 
@@ -327,7 +327,7 @@ export default {
 					bcc: this.selectBcc.map(this.recipientToRfc822).join(', '),
 					draftUID: uid,
 					subject: this.subjectVal,
-					body: this.bodyVal,
+					body: this.editorPlainText ? htmlToText(this.bodyVal) : this.bodyVal,
 					attachments: this.attachments,
 					folderId: this.replyTo ? this.replyTo.folderId : undefined,
 					messageId: this.replyTo ? this.replyTo.messageId : undefined,
diff --git a/src/components/TextEditor.vue b/src/components/TextEditor.vue
index 98276cc9b..b4f227621 100644
--- a/src/components/TextEditor.vue
+++ b/src/components/TextEditor.vue
@@ -137,7 +137,7 @@ export default {
 			}
 		},
 		onInput() {
-			this.$emit('input', this.html ? this.text : htmlToText(this.text))
+			this.$emit('input', this.text)
 		},
 	},
 }