diff --git a/apimail/static/apimail/assets/vue/components/MessageComposer.vue b/apimail/static/apimail/assets/vue/components/MessageComposer.vue
index cdfdbda6cd3b279e5422733b638e59da528012f9..34184810959c0af405d2dfd69f5424b418ac1471 100644
--- a/apimail/static/apimail/assets/vue/components/MessageComposer.vue
+++ b/apimail/static/apimail/assets/vue/components/MessageComposer.vue
@@ -1,6 +1,24 @@
 <template>
 <div>
   <h1 class="mb-4">Compose email message</h1>
+  <template v-if="!markReadySuccessful" class="mt-4">
+    <b-button
+      type="savedraft"
+      class="text-white px-2 py-1 my-2"
+      variant="warning"
+      @click.stop.prevent="saveMessage('draft')"
+      >
+      Save draft
+    </b-button>
+    <b-button
+      type="send"
+      class="text-white px-2 py-1 my-2"
+      variant="primary"
+      @click.stop.prevent="saveMessage('ready')"
+      >
+	Send
+      </b-button>
+  </template>
   <b-form>
     <b-row>
       <b-col class="col-lg-6">
@@ -228,7 +246,7 @@
     <template v-if="!markReadySuccessful" class="mt-4">
       <b-button
 	type="savedraft"
-	class="text-white px-1 py-0"
+	class="text-white px-2 py-1"
 	variant="warning"
 	@click.stop.prevent="saveMessage('draft')"
 	>
@@ -236,7 +254,7 @@
       </b-button>
       <b-button
 	type="send"
-	class="text-white px-1 py-0"
+	class="text-white px-2 py-1"
 	variant="primary"
 	@click.stop.prevent="saveMessage('ready')"
 	>
diff --git a/apimail/static/apimail/assets/vue/components/MessagesTable.vue b/apimail/static/apimail/assets/vue/components/MessagesTable.vue
index edaeb82ebef4e74e72d3e14eae405db72bcf30f6..d91314bdbd4d078254a24e22d0964560b3c570ae 100644
--- a/apimail/static/apimail/assets/vue/components/MessagesTable.vue
+++ b/apimail/static/apimail/assets/vue/components/MessagesTable.vue
@@ -20,7 +20,7 @@
       >
       <message-composer></message-composer>
       <template v-slot:modal-footer="{ close, }">
-	<b-button size="sm" variant="danger" @click="close()">
+	<b-button variant="danger" class="px-2 py-1" @click="close()">
 	  Close
 	</b-button>
       </template>