diff --git a/UI/Templates/MailerUI/UIxMailViewTemplate.wox b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
index 8e82049ef..c563b4086 100644
--- a/UI/Templates/MailerUI/UIxMailViewTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
@@ -39,14 +39,12 @@
         </div>
 
         <md-chips ng-model="message.flags">
-          <md-chip-template>
-            {{message.constructor.$tags[$chip][0]}}
-            <button md-chip-remove="md-chip-remove"
-                    class="md-chip-remove"
-                    ng-click="addOrRemoveTag('remove', $chip)">
-              <i class="md-icon-close"><!-- delete tag --></i>
-            </button>
-          </md-chip-template>
+          <md-chip-template>{{message.constructor.$tags[$chip][0]}}</md-chip-template>
+          <button md-chip-remove="md-chip-remove"
+                  class="md-chip-remove"
+                  ng-click="addOrRemoveTag('remove', $chip)">
+            <i class="md-icon-close"><!-- delete tag --></i>
+          </button>
           <md-autocomplete
               md-selected-item="tags.selected"
               md-selected-item-change="addOrRemoveTag('add', tag)"
diff --git a/UI/WebServerResources/scss/components/chips/chips.scss b/UI/WebServerResources/scss/components/chips/chips.scss
index 638ce7756..6a231b926 100644
--- a/UI/WebServerResources/scss/components/chips/chips.scss
+++ b/UI/WebServerResources/scss/components/chips/chips.scss
@@ -1,2 +1,14 @@
 /// chips.scss -*- Mode: scss; indent-tabs-mode: nil; basic-offset: 2 -*-
 @import 'extends';
+
+// Remove the line under the tags of the message viewer
+.msg-header {
+  md-chips {
+    .md-chips {
+      box-shadow: none;
+      &.md-focused {
+        box-shadow: none;
+      }
+    }
+  }
+}
\ No newline at end of file