diff --git a/UI/PreferencesUI/English.lproj/Localizable.strings b/UI/PreferencesUI/English.lproj/Localizable.strings
index d9b2679cb..b9f0e7610 100644
--- a/UI/PreferencesUI/English.lproj/Localizable.strings
+++ b/UI/PreferencesUI/English.lproj/Localizable.strings
@@ -6,6 +6,7 @@
 "General" = "General";
 "Calendar Options" = "Calendar Options";
 "Mail Options" = "Mail Options";
+"Identities" = "Identities";
 "Password" = "Password";
 
 /* ooo */
diff --git a/UI/PreferencesUI/French.lproj/Localizable.strings b/UI/PreferencesUI/French.lproj/Localizable.strings
index d41dd6d1d..4fe9850ed 100644
--- a/UI/PreferencesUI/French.lproj/Localizable.strings
+++ b/UI/PreferencesUI/French.lproj/Localizable.strings
@@ -6,6 +6,7 @@
 "General" = "Général";
 "Calendar Options" = "Calendrier";
 "Mail Options" = "Courrier";
+"Identities" = "Identités";
 "Password" = "Mot de passe";
 
 /* ooo */
@@ -79,6 +80,7 @@
 "messageforward_inline" = "intégrés";
 "messageforward_attached" = "en pièces jointes";
 
+/* Identities */
 "Default identity:" = "Identité par défaut :";
 "Manage identities..." = "Gérer les identitiés...";
 
diff --git a/UI/PreferencesUI/German.lproj/Localizable.strings b/UI/PreferencesUI/German.lproj/Localizable.strings
index 55db9ef65..63da5cd62 100644
--- a/UI/PreferencesUI/German.lproj/Localizable.strings
+++ b/UI/PreferencesUI/German.lproj/Localizable.strings
@@ -6,6 +6,7 @@
 "General" = "Allgemein";
 "Calendar Options" = "Kalender";
 "Mail Options" = "E-Mail";
+"Identities" = "Identities";
 "Password" = "Passwort";
 
 /* ooo */
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index 7857d13ff..3bf8804b5 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -19,6 +19,8 @@
 	    label:value="Calendar Options"/></li>
 	<li target="mailOptionsView"><var:string
 	    label:value="Mail Options"/></li>
+<!--	<li target="identitiesView"><var:string
+	    label:value="Identities"/></li> -->
 	<var:if condition="shouldDisplayPasswordChange">
 	  <li target="passwordView"><var:string label:value="Password"/></li>
 	</var:if>
@@ -80,12 +82,6 @@
 	<label><var:string label:value="Forward messages:"/>
 	  <var:popup list="messageForwardingList" item="item"
 	    string="itemMessageForwardingText" selection="userMessageForwarding"/></label><br/>
-	<label><var:string label:value="Default identity:"/>
-	  <var:popup list="identitiesList" item="item"
-	    string="itemIdentityText" selection="defaultIdentity"/></label>
-	<input type="button" class="button" id="manageIdentitiesBtn"
-	  label:value="Manage identities..."/>
-	<br/>
 	<!--	<label><input
 	const:name="inTheOffice" type="radio" const:value="YES"
 	var:selection="inTheOffice"/>
@@ -100,6 +96,12 @@
 	<textarea const:name="autoReplyText" var:value="autoReplyText"/>
       </label> -->
       </div>
+      <div id="identitiesView" class="tab">
+	<var:multiselection id="identitiesList" item="item"
+	  string="itemIdentityText" selection="defaultIdentity">
+	</var:multiselection>
+	<br/>
+      </div>
       <var:if condition="shouldDisplayPasswordChange">
 	<div id="passwordView" class="tab">
 	  <label><var:string label:value="New password:"
diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js
index 4a08999d7..8549871bc 100644
--- a/UI/WebServerResources/UIxPreferences.js
+++ b/UI/WebServerResources/UIxPreferences.js
@@ -3,21 +3,3 @@ function savePreferences(sender) {
 
    return false;
 }
-
-function initPreferences() {
-  var identitiesBtn = $("manageIdentitiesBtn");
-  Event.observe(identitiesBtn, "click",
-		popupIdentitiesWindow.bindAsEventListener(identitiesBtn));
-}
-
-function popupIdentitiesWindow(event) {
-  var urlstr = UserFolderURL + "identities";
-  var w = window.open(urlstr, "identities",
-		      "width=430,height=250,resizable=0,scrollbars=0,location=0");
-  w.opener = window;
-  w.focus();
-
-  preventDefault(event);
-}
-
-addEvent(window, 'load', initPreferences);