See ChangeLog

Monotone-Parent: 247bc51241f490e20ac9abc386e95d4198cefbaf
Monotone-Revision: 8bbf9c70304e5cb8320d6acb300955b814d1ff0c

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-07-24T15:17:38

UI/WebServerResources/UIxPreferences.js

@@ -17,6 +17,16 @@ function savePreferences(sender) {
         serializeContactsCategories();
     }
 
+    if (mailCustomFromEnabled && !emailRE.test($("email").value)) {
+        showAlertDialog(_("Please specify a valid sender address."));
+        sendForm = false;
+    }
+
+    if (!emailRE.test($("replyTo").value)) {
+        showAlertDialog(_("Please specify a valid reply-to address."));
+        sendForm = false;
+    }
+
     if ($("dayStartTime")) {
         var start = $("dayStartTime");
         var selectedStart = parseInt(start.options[start.selectedIndex].value);
@@ -63,10 +73,10 @@ function savePreferences(sender) {
         $("sieveFilters").setValue(Object.toJSON(jsonFilters));
     }
 
-    saveMailAccounts();
-
-    if (sendForm)
+    if (sendForm) {
+        saveMailAccounts();
         $("mainForm").submit();
+    }
 
     return false;
 }