From 8dba3356f5331412a16ee7db97272f5089fa2ac1 Mon Sep 17 00:00:00 2001
From: Phoenix Eve Aspacio <aspaciop@phoenixpeca.xyz>
Date: Sun, 13 May 2018 07:08:12 +0800
Subject: [PATCH 1/2] modal update for auto expunge

---
 data/web/modals/mailbox.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/data/web/modals/mailbox.php b/data/web/modals/mailbox.php
index c593ef95..b9bd1f59 100644
--- a/data/web/modals/mailbox.php
+++ b/data/web/modals/mailbox.php
@@ -134,6 +134,13 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
 							</div>
 						</div>
 					</div>
+					<div class="form-group">
+						<div class="col-sm-offset-2 col-sm-10">
+							<div class="checkbox">
+							<label><input type="checkbox" value="1" name="auto_expunge"> Auto expunge Junk/Trash folder</label>
+							</div>
+						</div>
+					</div>
 					<div class="form-group">
 						<div class="col-sm-offset-2 col-sm-10">
 							<div class="checkbox">
@@ -685,4 +692,4 @@ $("#multiple_bookings_select").change(function() {
 $("#multiple_bookings_custom").bind ("change keypress keyup blur", function () {
   $("#multiple_bookings").val($("#multiple_bookings_custom").val());
 });
-</script>
\ No newline at end of file
+</script>

From e14bb55789392f30fdb8f6db9bef8a999cd35299 Mon Sep 17 00:00:00 2001
From: Phoenix Eve Aspacio <aspaciop@phoenixpeca.xyz>
Date: Sun, 13 May 2018 07:12:22 +0800
Subject: [PATCH 2/2] Revert "modal update for auto expunge"

---
 data/web/modals/mailbox.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/data/web/modals/mailbox.php b/data/web/modals/mailbox.php
index b9bd1f59..51d857a0 100644
--- a/data/web/modals/mailbox.php
+++ b/data/web/modals/mailbox.php
@@ -134,13 +134,6 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
 							</div>
 						</div>
 					</div>
-					<div class="form-group">
-						<div class="col-sm-offset-2 col-sm-10">
-							<div class="checkbox">
-							<label><input type="checkbox" value="1" name="auto_expunge"> Auto expunge Junk/Trash folder</label>
-							</div>
-						</div>
-					</div>
 					<div class="form-group">
 						<div class="col-sm-offset-2 col-sm-10">
 							<div class="checkbox">