From e34ba5689cb2d816c6b353485ea274c95ba8983a Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Sun, 3 Feb 2013 20:40:06 -0500
Subject: [PATCH] Fix saving prefs with disabled mail module

---
 UI/WebServerResources/UIxPreferences.js | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js
index 73d69539e..7c902f6e5 100644
--- a/UI/WebServerResources/UIxPreferences.js
+++ b/UI/WebServerResources/UIxPreferences.js
@@ -17,15 +17,17 @@ function savePreferences(sender) {
         serializeContactsCategories();
     }
 
-    if (mailCustomFromEnabled && !emailRE.test($("email").value)) {
+    if (typeof mailCustomFromEnabled !== "undefined" && !emailRE.test($("email").value)) {
         showAlertDialog(_("Please specify a valid sender address."));
         sendForm = false;
     }
 
-    var replyTo = $("replyTo").value;
-    if (!replyTo.blank() && !emailRE.test(replyTo)) {
-        showAlertDialog(_("Please specify a valid reply-to address."));
-        sendForm = false;
+    if ($("replyTo")) {
+        var replyTo = $("replyTo").value;
+        if (!replyTo.blank() && !emailRE.test(replyTo)) {
+            showAlertDialog(_("Please specify a valid reply-to address."));
+            sendForm = false;
+        }
     }
 
     if ($("dayStartTime")) {
@@ -205,7 +207,8 @@ function initPreferences() {
         $("contactsCategoryDelete").observe("click", onContactsCategoryDelete);
     }
 
-    onReplyPlacementListChange();
+    if ($("replyPlacementList"))
+        onReplyPlacementListChange();
 
     var button = $("addDefaultEmailAddresses");
     if (button)
@@ -216,7 +219,8 @@ function initPreferences() {
         button.observe("click", onChangePasswordClick);
 
     initSieveFilters();
-    initMailAccounts();
+    if ($('mailOptionsView'))
+        initMailAccounts();
 
     button = $("enableVacationEndDate");
     if (button) {