diff --git a/CHANGELOG.md b/CHANGELOG.md
index a50818a..36b1557 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 Notable changes to Mailpit will be documented in this file.
 
+## [v1.6.18]
+
+### API
+- Sort tags before saving
+
+### UI
+- Add option to enable tag colors based on tag name hash
+- Display message tags below subject in message overview
+
+
 ## [v1.6.17]
 
 ### Fix
diff --git a/package-lock.json b/package-lock.json
index 5549f6f..f01e66e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,6 +12,7 @@
         "bootstrap": "^5.2.0",
         "bootstrap-icons": "^1.9.1",
         "bootstrap5-tags": "^1.4.41",
+        "color-hash": "^2.0.2",
         "moment": "^2.29.4",
         "prismjs": "^1.29.0",
         "rapidoc": "^9.3.4",
@@ -1163,6 +1164,11 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/color-hash": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/color-hash/-/color-hash-2.0.2.tgz",
+      "integrity": "sha512-6exeENAqBTuIR1wIo36mR8xVVBv6l1hSLd7Qmvf6158Ld1L15/dbahR9VUOiX7GmGJBCnQyS0EY+I8x+wa7egg=="
+    },
     "node_modules/combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
diff --git a/package.json b/package.json
index d213a45..869b943 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
     "bootstrap": "^5.2.0",
     "bootstrap-icons": "^1.9.1",
     "bootstrap5-tags": "^1.4.41",
+    "color-hash": "^2.0.2",
     "moment": "^2.29.4",
     "prismjs": "^1.29.0",
     "rapidoc": "^9.3.4",
diff --git a/server/ui-src/App.vue b/server/ui-src/App.vue
index 16e9b2f..1695c32 100644
--- a/server/ui-src/App.vue
+++ b/server/ui-src/App.vue
@@ -1,11 +1,11 @@
 <script>
-import commonMixins from './mixins.js';
-import Message from './templates/Message.vue';
-import MessageSummary from './templates/MessageSummary.vue';
-import MessageRelease from './templates/MessageRelease.vue';
-import MessageToast from './templates/MessageToast.vue';
-import moment from 'moment';
-import Tinycon from 'tinycon';
+import commonMixins from './mixins.js'
+import Message from './templates/Message.vue'
+import MessageSummary from './templates/MessageSummary.vue'
+import MessageRelease from './templates/MessageRelease.vue'
+import MessageToast from './templates/MessageToast.vue'
+import moment from 'moment'
+import Tinycon from 'tinycon'
 
 export default {
 	mixins: [commonMixins],
@@ -100,6 +100,27 @@ export default {
 			fallback: false
 		});
 
+		moment.updateLocale('en', {
+			relativeTime: {
+				future: "in %s",
+				past: "%s ago",
+				s: 'seconds',
+				ss: '%d secs',
+				m: "a minute",
+				mm: "%d mins",
+				h: "an hour",
+				hh: "%d hours",
+				d: "a day",
+				dd: "%d days",
+				w: "a week",
+				ww: "%d weeks",
+				M: "a month",
+				MM: "%d months",
+				y: "a year",
+				yy: "%d years"
+			}
+		});
+
 		this.connect();
 		this.getUISettings();
 		this.loadMessages();
@@ -885,9 +906,23 @@ export default {
 			</div>
 
 			<template v-if="!selected.length && tags.length && !message">
-				<h6 class="mt-4 text-muted"><small>Tags</small></h6>
-				<div class="list-group mt-2 mb-5">
-					<button class="list-group-item list-group-item-action small" v-for="tag in tags"
+				<div class="mt-4 text-muted">
+					<button class="btn btn-sm dropdown-toggle ms-n1" data-bs-toggle="dropdown" aria-expanded="false">
+						Tags
+					</button>
+					<ul class="dropdown-menu dropdown-menu-end">
+						<li>
+							<button class="dropdown-item" @click="toggleTagColors()">
+								<template v-if="showTagColors">Hide</template>
+								<template v-else>Show</template>
+								tag colors
+							</button>
+						</li>
+					</ul>
+				</div>
+				<div class="list-group mt-1 mb-5">
+					<button class="list-group-item list-group-item-action small px-2" v-for="tag in tags"
+						:style="showTagColors ? { borderLeftColor: colorHash(tag), borderLeftWidth: '4px' } : ''"
 						v-on:click="tagSearch($event, tag)" :class="inSearch(tag) ? 'active' : ''">
 						<i class="bi bi-tag-fill" v-if="inSearch(tag)"></i>
 						<i class="bi bi-tag" v-else></i>
@@ -898,7 +933,7 @@ export default {
 
 			<MessageSummary v-if="message" :message="message"></MessageSummary>
 
-			<div class="position-fixed bottom-0 bg-white py-2 text-muted w-100">
+			<div class="position-fixed bottom-0 bg-white py-2 text-muted small w-100">
 				<a href="#" class="text-muted" v-on:click="loadInfo">
 					<i class="bi bi-info-circle-fill"></i>
 					About
@@ -906,13 +941,13 @@ export default {
 			</div>
 		</div>
 
-		<div class="col-lg-10 col-md-9 mh-100 pe-0">
+		<div class="col-lg-10 col-md-9 mh-100 ps-0 ps-md-2 pe-0">
 			<div class="mh-100" style="overflow-y: auto;" :class="message ? 'd-none' : ''" id="message-page">
 				<div class="list-group my-2" v-if="items.length">
 					<a v-for="message in items" :href="'#' + message.ID"
 						v-on:click.ctrl="toggleSelected($event, message.ID)"
 						v-on:click.shift="selectRange($event, message.ID)"
-						class="row message d-flex small list-group-item list-group-item-action border-start-0 border-end-0"
+						class="row gx-1 message d-flex small list-group-item list-group-item-action border-start-0 border-end-0"
 						:class="message.Read ? 'read' : '', isSelected(message.ID) ? 'selected' : ''">
 						<div class="col-lg-3">
 							<div class="d-lg-none float-end text-muted text-nowrap small">
@@ -938,18 +973,21 @@ export default {
 								</span>
 							</div>
 						</div>
-						<div class="col-lg-6 mt-2 mt-lg-0">
-							<span class="badge text-bg-secondary me-1" v-for="t in message.Tags"
-								:title="'Filter messages tagged with ' + t" v-on:click="tagSearch($event, t)">
-								{{ t }}
-							</span>
-							<b>{{ message.Subject != "" ? message.Subject : "[ no subject ]" }}</b>
+						<div class="col-lg-6 col-xxl-7 mt-2 mt-lg-0">
+							<div><b>{{ message.Subject != "" ? message.Subject : "[ no subject ]" }}</b></div>
+							<div>
+								<span class="badge me-1" v-for="t in message.Tags"
+									:style="showTagColors ? { backgroundColor: colorHash(t) } : { backgroundColor: '#6c757d' }"
+									:title="'Filter messages tagged with ' + t" v-on:click="tagSearch($event, t)">
+									{{ t }}
+								</span>
+							</div>
 						</div>
 						<div class="d-none d-lg-block col-1 small text-end text-muted">
 							<i class="bi bi-paperclip float-start h6" v-if="message.Attachments"></i>
 							{{ getFileSize(message.Size) }}
 						</div>
-						<div class="d-none d-lg-block col-2 small text-end text-muted">
+						<div class="d-none d-lg-block col-2 col-xxl-1 small text-end text-muted">
 							{{ getRelativeCreated(message) }}
 						</div>
 					</a>
diff --git a/server/ui-src/assets/_bootstrap_variables.scss b/server/ui-src/assets/_bootstrap_variables.scss
index c6e6cd8..9f0ec33 100644
--- a/server/ui-src/assets/_bootstrap_variables.scss
+++ b/server/ui-src/assets/_bootstrap_variables.scss
@@ -5,3 +5,4 @@ $font-family-sans-serif: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetic
 $link-decoration: none;
 $primary: #2c3e50;
 $list-group-disabled-color: #adb5bd;
+$enable-negative-margins: true;
diff --git a/server/ui-src/mixins.js b/server/ui-src/mixins.js
index dd86b3d..07c6fb1 100644
--- a/server/ui-src/mixins.js
+++ b/server/ui-src/mixins.js
@@ -1,22 +1,32 @@
-import axios from 'axios';
-import { Modal } from 'bootstrap';
-import moment from 'moment';
+import axios from 'axios'
+import { Modal } from 'bootstrap'
+import moment from 'moment'
+import ColorHash from 'color-hash'
 
 
 // FakeModal is used to return a fake Bootstrap modal
-// if the ID returns nothing
+// if the ID returns nothing to prevent errors.
 function FakeModal() { }
-FakeModal.prototype.hide = function () { alert('close fake modal') }
-FakeModal.prototype.show = function () { alert('open fake modal') }
+FakeModal.prototype.hide = function () { }
+FakeModal.prototype.show = function () { }
+
+// Set up the color hash generator lightness and hue to ensure darker colors
+const colorHash = new ColorHash({ lightness: 0.3, saturation: [0.35, 0.5, 0.65] });
 
 /* Common mixin functions used in apps */
 const commonMixins = {
 	data() {
 		return {
-			loading: 0
+			loading: 0,
+			tagColorCache: {},
+			showTagColors: true
 		}
 	},
 
+	mounted() {
+		this.showTagColors = localStorage.getItem('showTagsColors')
+	},
+
 	methods: {
 		getFileSize: function (bytes) {
 			var i = Math.floor(Math.log(bytes) / Math.log(1024));
@@ -201,6 +211,27 @@ const commonMixins = {
 			}
 
 			return 'bi-file-arrow-down-fill';
+		},
+
+		// Returns a hex color based on a string.
+		// Values are stored in an array for faster lookup / processing.
+		colorHash: function (s) {
+			if (this.tagColorCache[s] != undefined) {
+				return this.tagColorCache[s]
+			}
+			this.tagColorCache[s] = colorHash.hex(s)
+
+			return this.tagColorCache[s]
+		},
+
+		toggleTagColors: function () {
+			if (this.showTagColors) {
+				localStorage.removeItem('showTagsColors')
+				this.showTagColors = false
+			} else {
+				localStorage.setItem('showTagsColors', '1')
+				this.showTagColors = true
+			}
 		}
 	}
 }
diff --git a/storage/tags.go b/storage/tags.go
index 4c47506..7b06407 100644
--- a/storage/tags.go
+++ b/storage/tags.go
@@ -22,6 +22,8 @@ func SetTags(id string, tags []string) error {
 		}
 	}
 
+	sort.Strings(applyTags)
+
 	tagJSON, err := json.Marshal(applyTags)
 	if err != nil {
 		logger.Log().Errorf("[db] setting tags for message %s", id)