diff --git a/apimail/static/apimail/assets/vue/components/MessageComposer.vue b/apimail/static/apimail/assets/vue/components/MessageComposer.vue
index fcc82255a164a5de7c76d3d01f36daf4a04ef9ff..8eebd92113d10d2a85c4ec7349edc5e3a911336b 100644
--- a/apimail/static/apimail/assets/vue/components/MessageComposer.vue
+++ b/apimail/static/apimail/assets/vue/components/MessageComposer.vue
@@ -415,11 +415,9 @@ export default {
 		this.form.attachments = this.originalmessage.attachment_files
 	    }
 	    if (this.originalmessage.data.hasOwnProperty("body-html")) {
-		console.log('Putting html')
 		this.form.body_html += (this.$sanitize(this.originalmessage.data["body-html"]))
 	    }
 	    else {
-		console.log('Putting plain')
 		this.form.body_html += (this.$sanitize(this.originalmessage.data["body-plain"]))
 	    }
 	    this.form.body_html += '</blockquote>'
diff --git a/apimail/static/apimail/assets/vue/components/MessageContent.vue b/apimail/static/apimail/assets/vue/components/MessageContent.vue
index ff038725bdfc4d6bf282080b92f420dc8bc73eb1..eef0eb149423ad700a717ef4507b77a64a11ff78 100644
--- a/apimail/static/apimail/assets/vue/components/MessageContent.vue
+++ b/apimail/static/apimail/assets/vue/components/MessageContent.vue
@@ -11,13 +11,13 @@
       <ul class="list-inline m-2">
 	<li class="list-inline-item">
 	  <b-button
-	    v-b-modal.modal-reply
+	    v-b-modal="'modal-reply-' + message.uuid"
 	    variant="primary"
 	    >
 	    Reply
 	  </b-button>
 	  <b-modal
-	    id="modal-reply"
+	    :id="'modal-reply-' + message.uuid"
 	    size="xl"
 	    title="Reply"
 	    hide-header-close
@@ -34,14 +34,14 @@
 	</li>
 	<li class="list-inline-item">
 	  <b-button
-	    v-b-modal.modal-forward
+	    v-b-modal="'modal-forward-' + message.uuid"
 	    variant="dark"
 	    text-variant="white"
 	    >
 	    Forward
 	  </b-button>
 	  <b-modal
-	    id="modal-forward"
+	    :id="'modal-forward-' + message.uuid"
 	    size="xl"
 	    title="Forward"
 	    hide-header-close