diff --git a/scipost_django/apimail/static/apimail/assets/vue/components/MessagesTable.vue b/scipost_django/apimail/static/apimail/assets/vue/components/MessagesTable.vue
index 432c720689f54d35ab95ccc1774f35e9c76f100d..e5fe79f281058e3186dbe6f54f8097b3b42b070e 100644
--- a/scipost_django/apimail/static/apimail/assets/vue/components/MessagesTable.vue
+++ b/scipost_django/apimail/static/apimail/assets/vue/components/MessagesTable.vue
@@ -370,10 +370,18 @@
       @row-clicked="onMessageRowClicked"
       >
       <template v-slot:table-busy>
-      	<div class="text-center text-primary my-2">
-      	  <b-spinner class="align-middle"></b-spinner>
-      	  <strong>Loading...</strong>
-      	</div>
+	<button
+	  class="btn btn-outline-primary"
+	  type="button" disabled
+	  >
+	  <span
+	    class="spinner-grow spinner-grow-sm"
+	    role="status"
+	    aria-hidden="true"
+	    >
+	  </span>
+	  Loading...
+	</button>
       </template>
       <template v-slot:head(tab)="row">
 	<span v-if="tabbedMessages.length > 0">
diff --git a/scipost_django/apimail/static/apimail/assets/vue/messages_table.js b/scipost_django/apimail/static/apimail/assets/vue/messages_table.js
index 604e8ad24778fefde503e5fb894d57c46c5eca6d..644b46ac9f227b51b7d86a38d053e6f37aeb0ec1 100644
--- a/scipost_django/apimail/static/apimail/assets/vue/messages_table.js
+++ b/scipost_django/apimail/static/apimail/assets/vue/messages_table.js
@@ -63,8 +63,6 @@ Vue.component('b-input-group-append', BInputGroupAppend)
 Vue.use(ModalPlugin)
 // Pagination
 Vue.component('b-pagination', BPagination)
-// Spinner
-Vue.component('b-spinner', BSpinner)
 // Tables
 Vue.use(TablePlugin)
 // Tabs
diff --git a/webpack.common.js b/webpack.common.js
index 25598455e341a1fdb8b69439ac0999965b5946b9..5b5bc0b23f9942e0b0d8bc281cd537a942ae8da9 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -16,6 +16,7 @@ module.exports = {
             "./scipost_django/scipost/static/scipost/assets/js/api.js",
 	],
 	apimail: [
+            "./scipost_django/scipost/static/scipost/assets/js/base.js",
             "./scipost_django/apimail/static/apimail/assets/vue/messages_table.js",
 	],
 	qr: [