diff --git a/server/ui-src/App.vue b/server/ui-src/App.vue
index 483ec4e..5089749 100644
--- a/server/ui-src/App.vue
+++ b/server/ui-src/App.vue
@@ -128,9 +128,8 @@ export default {
 				self.start = response.data.start;
 				self.items = response.data.messages;
 				self.tags = response.data.tags;
-				if (!self.existingTags.length) {
-					self.existingTags = JSON.parse(JSON.stringify(self.tags));
-				}
+				self.existingTags = JSON.parse(JSON.stringify(self.tags));
+
 				// if pagination > 0 && results == 0 reload first page (prune)
 				if (response.data.count == 0 && response.data.start > 0) {
 					self.start = 0;
@@ -590,13 +589,13 @@ export default {
 						<span v-if="!total" class="ms-2">Mailpit</span>
 					</a>
 					<div v-if="total" class="ms-md-2 d-flex bg-white border rounded-start flex-fill position-relative">
-						<input type="text" class="form-control border-0" v-model.trim="search"
-							placeholder="Search mailbox">
+						<input type="text" class="form-control border-0" v-model.trim="search" placeholder="Search mailbox">
 						<span class="btn btn-link position-absolute end-0 text-muted" v-if="search"
 							v-on:click="resetSearch"><i class="bi bi-x-circle"></i></span>
 					</div>
-					<button v-if="total" class="btn btn-outline-light" type="submit"><i
-							class="bi bi-search"></i></button>
+					<button v-if="total" class="btn btn-outline-light" type="submit">
+						<i class="bi bi-search"></i>
+					</button>
 				</div>
 			</form>
 		</div>
@@ -626,8 +625,8 @@ export default {
 					{{ formatNumber(start + 1) }}-{{ formatNumber(start + items.length) }} <small>of</small>
 					{{ formatNumber(total) }}
 				</small>
-				<button class="btn btn-outline-light ms-2 me-1" :disabled="!canPrev" v-on:click="viewPrev"
-					v-if="!searching" :title="'View previous ' + limit + ' messages'">
+				<button class="btn btn-outline-light ms-2 me-1" :disabled="!canPrev" v-on:click="viewPrev" v-if="!searching"
+					:title="'View previous ' + limit + ' messages'">
 					<i class="bi bi-caret-left-fill"></i>
 				</button>
 				<button class="btn btn-outline-light" :disabled="!canNext" v-on:click="viewNext" v-if="!searching"
@@ -735,13 +734,13 @@ export default {
 							<div class="text-truncate d-lg-none privacy">
 								<span v-if="message.From" :title="message.From.Address">{{
 									message.From.Name ?
-										message.From.Name : message.From.Address
+									message.From.Name : message.From.Address
 								}}</span>
 							</div>
 							<div class="text-truncate d-none d-lg-block privacy">
 								<b v-if="message.From" :title="message.From.Address">{{
 									message.From.Name ?
-										message.From.Name : message.From.Address
+									message.From.Name : message.From.Address
 								}}</b>
 							</div>
 							<div class="d-none d-lg-block text-truncate text-muted small privacy">
@@ -810,8 +809,7 @@ export default {
 	</div>
 
 	<!-- Modal -->
-	<div class="modal fade" id="MarkAllReadModal" tabindex="-1" aria-labelledby="MarkAllReadModalLabel"
-		aria-hidden="true">
+	<div class="modal fade" id="MarkAllReadModal" tabindex="-1" aria-labelledby="MarkAllReadModalLabel" aria-hidden="true">
 		<div class="modal-dialog">
 			<div class="modal-content">
 				<div class="modal-header">
@@ -882,8 +880,7 @@ export default {
 							</a>
 						</div>
 						<div class="col-sm-6">
-							<a class="btn btn-primary w-100" href="https://github.com/axllent/mailpit/wiki"
-								target="_blank">
+							<a class="btn btn-primary w-100" href="https://github.com/axllent/mailpit/wiki" target="_blank">
 								Documentation
 								<i class="bi bi-box-arrow-up-right"></i>
 							</a>
diff --git a/server/ui-src/templates/Message.vue b/server/ui-src/templates/Message.vue
index 9e061d8..782430e 100644
--- a/server/ui-src/templates/Message.vue
+++ b/server/ui-src/templates/Message.vue
@@ -2,8 +2,8 @@
 <script>
 import commonMixins from '../mixins.js';
 import Prism from "prismjs";
+import Tags from "bootstrap5-tags";
 import Attachments from './Attachments.vue';
-import MessageTags from './MessageTags.vue';
 
 export default {
 	props: {
@@ -12,8 +12,7 @@ export default {
 	},
 
 	components: {
-		Attachments,
-		MessageTags
+		Attachments
 	},
 
 	mixins: [commonMixins],
@@ -22,36 +21,54 @@ export default {
 		return {
 			srcURI: false,
 			iframes: [], // for resizing
-			tagComponent: false, // to force rerendering of component
+			showTags: false, // to force rerendering of component
+			messageTags: [],
+			allTags: [],
 		}
 	},
 
 	watch: {
 		message: {
-			handler(newQuestion) {
+			handler() {
 				let self = this;
-				self.tagComponent = false;
+				self.showTags = false;
+				self.messageTags = self.message.Tags;
+				self.allTags = self.existingTags;
 				// delay to select first tab and add HTML highlighting (prev/next)
 				self.$nextTick(function () {
 					self.renderUI();
-					self.tagComponent = true;
+					self.showTags = true;
+					self.$nextTick(function () {
+						Tags.init("select[multiple]");
+					});
 				});
 			},
 			// force eager callback execution
 			immediate: true
+		},
+		messageTags() {
+			// save changed to tags
+			if (this.showTags) {
+				this.saveTags();
+			}
 		}
 	},
 
 	mounted() {
 		let self = this;
-		self.tagComponent = false;
+		self.showTags = false;
+		self.allTags = self.existingTags;
 		window.addEventListener("resize", self.resizeIframes);
 		self.renderUI();
 		var tabEl = document.getElementById('nav-raw-tab');
 		tabEl.addEventListener('shown.bs.tab', function (event) {
 			self.srcURI = 'api/v1/message/' + self.message.ID + '/raw';
 		});
-		self.tagComponent = true;
+
+		self.showTags = true;
+		self.$nextTick(function () {
+			Tags.init("select[multiple]");
+		});
 	},
 
 	unmounted: function () {
@@ -105,6 +122,20 @@ export default {
 			if (s) {
 				s.style.height = s.contentWindow.document.body.scrollHeight + 50 + 'px';
 			}
+		},
+
+		saveTags: function () {
+			let self = this;
+
+			var data = {
+				ids: [this.message.ID],
+				tags: this.messageTags
+			}
+
+			self.put('api/v1/tags', data, function (response) {
+				self.scrollInPlace = true;
+				self.$emit('loadMessages');
+			});
 		}
 	}
 }
@@ -162,15 +193,27 @@ export default {
 							<th class="small">Date</th>
 							<td>{{ messageDate(message.Date) }}</td>
 						</tr>
-						<MessageTags :message="message" :existingTags="existingTags"
-							@load-messages="$emit('loadMessages')" v-if="tagComponent">
-						</MessageTags>
+
+						<tr class="small" v-if="showTags">
+							<th>Tags</th>
+							<td>
+								<select class="form-select small tag-selector" v-model="messageTags" multiple
+									data-allow-new="true" data-clear-end="true" data-allow-clear="true"
+									data-placeholder="Add tags..." data-badge-style="secondary"
+									data-regex="^([a-zA-Z0-9\-\ \_]){3,}$" data-separator="|,|">
+									<option value="">Type a tag...</option>
+									<!-- you need at least one option with the placeholder -->
+									<option v-for="t in allTags" :value="t">{{ t }}</option>
+								</select>
+								<div class="invalid-feedback">Please select a valid tag.</div>
+							</td>
+						</tr>
 					</tbody>
 				</table>
 			</div>
 			<div class="col-md-auto text-md-end mt-md-3">
 				<!-- <p class="text-muted small d-none d-md-block mb-2"><small>{{ messageDate(message.Date) }}</small></p>
-				<p class="text-muted small d-none d-md-block"><small>Size: {{ getFileSize(message.Size) }}</small></p> -->
+																																																																												<p class="text-muted small d-none d-md-block"><small>Size: {{ getFileSize(message.Size) }}</small></p> -->
 				<div class="dropdown mt-2 mt-md-0" v-if="allAttachments(message)">
 					<button class="btn btn-outline-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown"
 						aria-expanded="false">
@@ -196,8 +239,8 @@ export default {
 				<button class="nav-link" id="nav-html-tab" data-bs-toggle="tab" data-bs-target="#nav-html" type="button"
 					role="tab" aria-controls="nav-html" aria-selected="true" v-if="message.HTML">HTML</button>
 				<button class="nav-link" id="nav-html-source-tab" data-bs-toggle="tab" data-bs-target="#nav-html-source"
-					type="button" role="tab" aria-controls="nav-html-source" aria-selected="false"
-					v-if="message.HTML">HTML Source</button>
+					type="button" role="tab" aria-controls="nav-html-source" aria-selected="false" v-if="message.HTML">HTML
+					Source</button>
 				<button class="nav-link" id="nav-plain-text-tab" data-bs-toggle="tab" data-bs-target="#nav-plain-text"
 					type="button" role="tab" aria-controls="nav-plain-text" aria-selected="false"
 					:class="message.HTML == '' ? 'show' : ''">Text</button>
@@ -208,8 +251,8 @@ export default {
 		<div class="tab-content mb-5" id="nav-tabContent">
 			<div v-if="message.HTML != ''" class="tab-pane fade show" id="nav-html" role="tabpanel"
 				aria-labelledby="nav-html-tab" tabindex="0">
-				<iframe target-blank="" class="tab-pane" id="preview-html" :srcdoc="message.HTML"
-					v-on:load="resizeIframe" seamless frameborder="0" style="width: 100%; height: 100%;">
+				<iframe target-blank="" class="tab-pane" id="preview-html" :srcdoc="message.HTML" v-on:load="resizeIframe"
+					seamless frameborder="0" style="width: 100%; height: 100%;">
 				</iframe>
 				<Attachments v-if="allAttachments(message).length" :message="message"
 					:attachments="allAttachments(message)"></Attachments>
@@ -218,8 +261,8 @@ export default {
 				tabindex="0" v-if="message.HTML">
 				<pre><code class="language-html">{{ message.HTML }}</code></pre>
 			</div>
-			<div class="tab-pane fade" id="nav-plain-text" role="tabpanel" aria-labelledby="nav-plain-text-tab"
-				tabindex="0" :class="message.HTML == '' ? 'show' : ''">
+			<div class="tab-pane fade" id="nav-plain-text" role="tabpanel" aria-labelledby="nav-plain-text-tab" tabindex="0"
+				:class="message.HTML == '' ? 'show' : ''">
 				<div class="text-view">{{ message.Text }}</div>
 				<Attachments v-if="allAttachments(message).length" :message="message"
 					:attachments="allAttachments(message)"></Attachments>
diff --git a/server/ui-src/templates/MessageTags.vue b/server/ui-src/templates/MessageTags.vue
deleted file mode 100644
index 5420cae..0000000
--- a/server/ui-src/templates/MessageTags.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-
-<script>
-import commonMixins from '../mixins.js';
-import Tags from "bootstrap5-tags";
-
-export default {
-	props: {
-		message: Object,
-		existingTags: Array
-	},
-
-	mixins: [commonMixins],
-
-	data() {
-		return {
-			messageTags: [],
-		}
-	},
-
-	mounted() {
-		let self = this;
-		self.loaded = false;
-		self.messageTags = self.message.Tags;
-		// delay until vue has rendered
-		self.$nextTick(function () {
-			Tags.init("select[multiple]");
-			self.$nextTick(function () {
-				self.loaded = true;
-			});
-		});
-	},
-
-	watch: {
-		messageTags() {
-			if (this.loaded) {
-				this.saveTags();
-			}
-		}
-	},
-
-	methods: {
-		saveTags: function () {
-			let self = this;
-
-			var data = {
-				ids: [this.message.ID],
-				tags: this.messageTags
-			}
-
-			self.put('api/v1/tags', data, function (response) {
-				self.scrollInPlace = true;
-				self.$emit('loadMessages');
-			});
-		}
-	}
-}
-</script>
-
-<template>
-	<tr class="small">
-		<th>Tags</th>
-		<td>
-			<select class="form-select small tag-selector" v-model="messageTags" multiple data-allow-new="true"
-				data-clear-end="true" data-allow-clear="true" data-placeholder="Add tags..."
-				data-badge-style="secondary" data-regex="^([a-zA-Z0-9\-\ \_]){3,}$" data-separator="|,|">
-				<option value="">Type a tag...</option><!-- you need at least one option with the placeholder -->
-				<option v-for="t in existingTags" :value="t">{{ t }}</option>
-			</select>
-			<div class="invalid-feedback">Please select a valid tag.</div>
-		</td>
-	</tr>
-</template>