From a530461b4d159b2e4054608d3aa32a7dd8ad7470 Mon Sep 17 00:00:00 2001
From: Richard Steinmetz <richard@steinmetz.cloud>
Date: Fri, 2 Sep 2022 16:15:24 +0200
Subject: [PATCH] fixup! Implement automatic out-of-office replies

---
 src/components/AccountSettings.vue | 13 +++++++------
 src/components/OutOfOfficeForm.vue |  9 +--------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/components/AccountSettings.vue b/src/components/AccountSettings.vue
index 0bffac29a5..a290dc37dc 100644
--- a/src/components/AccountSettings.vue
+++ b/src/components/AccountSettings.vue
@@ -64,12 +64,13 @@
 			v-if="account"
 			id="out-of-office-replies"
 			:title="t('mail', 'Vacation responder')">
-			<div id="out-of-office-replies">
-				<OutOfOfficeForm v-if="account.sieveEnabled" :account="account" />
-				<p v-else>
-					{{ t('mail', 'Please connect to a sieve server first.') }}
-				</p>
-			</div>
+			<p class="settings-hint">
+				{{ t('mail', 'Automated reply to incoming messages. If someone sends you several messages, this automated reply will be sent at most once every 4 days.') }}
+			</p>
+			<OutOfOfficeForm v-if="account.sieveEnabled" :account="account" />
+			<p v-else>
+				{{ t('mail', 'Please connect to a sieve server first.') }}
+			</p>
 		</AppSettingsSection>
 		<AppSettingsSection v-if="account && account.sieveEnabled"
 			id="sieve-filter"
diff --git a/src/components/OutOfOfficeForm.vue b/src/components/OutOfOfficeForm.vue
index 11446d5c89..7efbe28a25 100644
--- a/src/components/OutOfOfficeForm.vue
+++ b/src/components/OutOfOfficeForm.vue
@@ -21,11 +21,8 @@
   -->
 
 <template>
+	<!-- Wait until sieve script has been fetched before showing form. -->
 	<form v-if="sieveScriptData" class="form" @submit.prevent="submit">
-		<p class="form__help-text">
-			{{ t('mail', 'Automated reply to incoming messages. If someone sends you several messages, this automated reply will be sent at most once every 4 days.') }}
-		</p>
-
 		<div class="form__multi-row">
 			<fieldset class="form__fieldset">
 				<input
@@ -273,10 +270,6 @@ export default {
 	flex-direction: column;
 	gap: 15px;
 
-	&__help-text {
-		color: var(--color-text-maxcontrast);
-	}
-
 	&__fieldset {
 		display: flex;
 		flex-direction: column;