diff --git a/UI/WebServerResources/js/Preferences/PreferencesController.js b/UI/WebServerResources/js/Preferences/PreferencesController.js
index eebf1e8cc..c5363d08b 100644
--- a/UI/WebServerResources/js/Preferences/PreferencesController.js
+++ b/UI/WebServerResources/js/Preferences/PreferencesController.js
@@ -136,7 +136,8 @@
     };
 
     this.editMailAccount = function(event, index, form) {
-      var account = new Account(this.preferences.defaults.AuxiliaryMailAccounts[index]);
+      var data = _.cloneDeep(this.preferences.defaults.AuxiliaryMailAccounts[index]);
+      var account = new Account(data);
       $mdDialog.show({
         controller: 'AccountDialogController',
         controllerAs: '$AccountDialogController',
@@ -151,7 +152,7 @@
       }).then(function() {
         vm.preferences.defaults.AuxiliaryMailAccounts[index] = account.$omit();
         form.$setDirty();
-      });
+      }).catch(_.noop); // Cancel
     };
 
     this.removeMailAccount = function(index, form) {
diff --git a/UI/WebServerResources/scss/components/list/list.scss b/UI/WebServerResources/scss/components/list/list.scss
index 72257bf25..4b6d23833 100644
--- a/UI/WebServerResources/scss/components/list/list.scss
+++ b/UI/WebServerResources/scss/components/list/list.scss
@@ -199,6 +199,9 @@ div.md-tile-left {
     .#{$md}-subhead {
       @extend .#{$md}-body-1;
       white-space: pre;
+      &.md-block {
+        display: block;
+      }
     }
     .#{$md}-body {
       @extend .#{$md}-caption;