From 1c4ff40d330290711a3a6affa56715d30145064b Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 15 Oct 2020 14:07:04 -0400
Subject: [PATCH] fix(preferences(mail)): make sure auto-reply (vacation) text
 is set

---
 SoObjects/SOGo/SOGoSieveManager.m             | 3 +++
 UI/Templates/PreferencesUI/UIxPreferences.wox | 1 +
 2 files changed, 4 insertions(+)

diff --git a/SoObjects/SOGo/SOGoSieveManager.m b/SoObjects/SOGo/SOGoSieveManager.m
index d09b74b85..7dec0cd0b 100644
--- a/SoObjects/SOGo/SOGoSieveManager.m
+++ b/SoObjects/SOGo/SOGoSieveManager.m
@@ -964,6 +964,9 @@ static NSString *sieveScriptName = @"sogo";
       text = [values objectForKey: @"autoReplyText"];
       b = YES;
 
+      if (!text)
+        text = @"";
+
       if (!useCustomSubject)
         {
           // If user has not specified a custom subject, fallback to the domain's defaults
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index c6c962962..c895b6b3b 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -985,6 +985,7 @@
                   </var:if>
                   <textarea name="autoReplyText"
                             id="autoReplyText"
+                            ng-required="app.preferences.defaults.Vacation.enabled == 1"
                             ng-model="app.preferences.defaults.Vacation.autoReplyText"/>
                   <var:if condition="vacationFooter.length">
                     <p class="text-preview" md-colors="::{color: 'default-background-600'}"><var:string value="vacationFooter"/></p>