diff --git a/apimail/static/apimail/assets/vue/components/MessagesTable.vue b/apimail/static/apimail/assets/vue/components/MessagesTable.vue
index 59c6293d96d245949b94cd7309d91a112f45589b..db691b0a1fb72937e539a9a00c4fa6c25ac7c2f2 100644
--- a/apimail/static/apimail/assets/vue/components/MessagesTable.vue
+++ b/apimail/static/apimail/assets/vue/components/MessagesTable.vue
@@ -124,19 +124,19 @@
       <b-row>
 	<b-col class="col-lg-6">
 	  <h2>Messages for <strong>{{ accountSelected.email }}</strong></h2>
-	  <!-- <b-form-group -->
-	  <!--   label="Auto refresh (minutes): " -->
-	  <!--   label-cols-sm="4" -->
-	  <!--   label-align-sm="right" -->
-	  <!--   label-size="sm" -->
-	  <!--   > -->
-	  <!--   <b-form-radio-group -->
-	  <!--     v-model="refreshMinutes" -->
-	  <!--     :options="refreshMinutesOptions" -->
-	  <!--     class="float-center" -->
-	  <!--     > -->
-	  <!--   </b-form-radio-group> -->
-	  <!-- </b-form-group> -->
+	  <b-form-group
+	    label="Auto refresh (minutes): "
+	    label-cols-sm="4"
+	    label-align-sm="right"
+	    label-size="sm"
+	    >
+	    <b-form-radio-group
+	      v-model="refreshMinutes"
+	      :options="refreshMinutesOptions"
+	      class="float-center"
+	      >
+	    </b-form-radio-group>
+	  </b-form-group>
 	  <small class="p-2">Last loaded: {{ lastLoaded }}</small>
 	  <b-badge
 	    class="p-2"
@@ -409,7 +409,7 @@ export default {
 	    ],
 	    refreshInterval: null,
 	    refreshMinutes: 1,
-	    refreshMinutesOptions: [ 1, 5, 15, 60 ],
+	    refreshMinutesOptions: [ 1, 5, 15 ],
 	    tags: null,
 	    tagRequired: 'any',
 	}
@@ -542,11 +542,11 @@ export default {
 		this.fetchDrafts()
 	    }
 	})
-	// this.refreshInterval = setInterval(this.refreshMessages, this.refreshMinutes * 1000)
+ 	this.refreshInterval = setInterval(this.refreshMessages, this.refreshMinutes * 60000)
+    },
+    beforeDestroy() {
+    	clearInterval(this.refreshInterval)
     },
-    // beforeDestroy() {
-    // 	clearInterval(this.refreshInterval)
-    // },
     watch: {
 	accountSelected: function () {
 	    this.$root.$emit('bv::refresh::table', 'my-table')
@@ -566,10 +566,10 @@ export default {
 	accountSelected: function () {
 	    this.tabbedMessages = []
 	},
-	// refreshMinutes: function () {
-	//     clearInterval(this.refreshInterval)
-	//     this.refreshInterval = setInterval(this.refreshMessages, this.refreshMinutes * 1000)
-	// }
+	refreshMinutes: function () {
+	    clearInterval(this.refreshInterval)
+	    this.refreshInterval = setInterval(this.refreshMessages, this.refreshMinutes * 60000)
+	}
     }
 }