diff --git a/apimail/static/apimail/assets/vue/components/MessageComposer.vue b/apimail/static/apimail/assets/vue/components/MessageComposer.vue
index 34184810959c0af405d2dfd69f5424b418ac1471..17cc1bdbe43b2c9f230d21484a74aed66a755224 100644
--- a/apimail/static/apimail/assets/vue/components/MessageComposer.vue
+++ b/apimail/static/apimail/assets/vue/components/MessageComposer.vue
@@ -457,6 +457,10 @@ export default {
     },
     mounted () {
 	this.fetchCurrentAccounts()
+	if (this.accountSelected) {
+	    this.form.from_account = this.accountSelected.pk
+	    this.form.headers_added['Reply-To'] = this.accountSelected.email
+	}
 	if (this.draftmessage) {
 	    this.currentdraft_uuid = this.draftmessage.uuid
 	    this.form.from_account = this.draftmessage.from_account
@@ -468,9 +472,7 @@ export default {
 	    this.form.attachments = this.draftmessage.attachment_files
 	}
       	else if (this.originalmessage) {
-	    this.form.from_account = this.accountSelected.pk
       	    this.form.body_html = ('<br><br><blockquote>')
-	    this.form.headers_added['Reply-To'] = this.accountSelected.email
 	    this.form.headers_added['In-Reply-To'] = this.originalmessage.data['Message-Id']
 	    if (this.originalmessage.data['References']) {
 		this.form.headers_added['References'] = (
diff --git a/apimail/static/apimail/assets/vue/components/MessagesTable.vue b/apimail/static/apimail/assets/vue/components/MessagesTable.vue
index d91314bdbd4d078254a24e22d0964560b3c570ae..b6c54863e46d75dd811a11ab2627b71454623af1 100644
--- a/apimail/static/apimail/assets/vue/components/MessagesTable.vue
+++ b/apimail/static/apimail/assets/vue/components/MessagesTable.vue
@@ -18,7 +18,10 @@
       no-close-on-escape
       no-close-on-backdrop
       >
-      <message-composer></message-composer>
+      <message-composer
+	:accountSelected="accountSelected"
+	>
+      </message-composer>
       <template v-slot:modal-footer="{ close, }">
 	<b-button variant="danger" class="px-2 py-1" @click="close()">
 	  Close