diff --git a/UI/WebServerResources/UIxMailEditor.css b/UI/WebServerResources/UIxMailEditor.css
index 1dabfa79e..fd2f844ef 100644
--- a/UI/WebServerResources/UIxMailEditor.css
+++ b/UI/WebServerResources/UIxMailEditor.css
@@ -83,6 +83,11 @@ div#headerArea
 { border-top: 1px solid #fff;
   padding: 5px 0px; }
 
+div#headerArea div.addressList
+{ max-height: 10em;
+  overflow: auto;
+  overflow-x: hidden; }
+
 div#attachmentsArea
 { display: none;
   float: right;
diff --git a/UI/WebServerResources/UIxMailToSelection.js b/UI/WebServerResources/UIxMailToSelection.js
index a95e7d0c8..03853ff58 100644
--- a/UI/WebServerResources/UIxMailToSelection.js
+++ b/UI/WebServerResources/UIxMailToSelection.js
@@ -105,6 +105,9 @@ function addressFieldGotFocus(sender) {
 function addressFieldLostFocus(sender) {
   lastIndex = this.getIndexFromIdentifier(sender.id);
   
+	if (sender.confirmedValue)
+		sender.value = sender.confirmedValue;
+
   var addresses = sender.value.split(',');
   if (addresses.length > 0) {
     sender.value = addresses[0].strip();