diff --git a/data/web/edit.php b/data/web/edit.php
index 060af548..6d387eb7 100644
--- a/data/web/edit.php
+++ b/data/web/edit.php
@@ -1085,7 +1085,8 @@ if (isset($_SESSION['mailcow_cc_role'])) {
             <div class="form-group">
               <label class="control-label col-sm-2" for="custom_params"><?=$lang['add']['custom_params'];?></label>
               <div class="col-sm-10">
-              <input type="text" class="form-control" name="custom_params" id="custom_params" value="<?=htmlspecialchars($result['custom_params'], ENT_QUOTES, 'UTF-8');?>">
+              <input type="text" class="form-control" name="custom_params" id="custom_params" value="<?=htmlspecialchars($result['custom_params'], ENT_QUOTES, 'UTF-8');?>" placeholder="--dry --some-param=xy --other-param=yx">
+              <small class="help-block"><?=$lang['add']['custom_params_hint'];?></small>
               </div>
             </div>
             <div class="form-group">
diff --git a/data/web/lang/lang.de.php b/data/web/lang/lang.de.php
index 63b33614..0cea4988 100644
--- a/data/web/lang/lang.de.php
+++ b/data/web/lang/lang.de.php
@@ -438,6 +438,7 @@ $lang['add']['delete2duplicates'] = 'Lösche Duplikate im Ziel';
 $lang['add']['delete1'] = 'Lösche Nachricht nach Übertragung vom Quell-Server';
 $lang['add']['delete2'] = 'Lösche Nachrichten von Ziel-Server, die nicht auf Quell-Server vorhanden sind';
 $lang['add']['custom_params'] = 'Eigene Parameter';
+$lang['add']['custom_params_hint'] = 'Richtig: --param=xy, falsch: --param xy';
 $lang['add']['subscribeall'] = 'Alle synchronisierten Ordner abonnieren';
 $lang['add']['timeout1'] = 'Timeout für Verbindung zum Remote-Host';
 $lang['add']['timeout2'] = 'Timeout für Verbindung zum lokalen Host';
diff --git a/data/web/lang/lang.en.php b/data/web/lang/lang.en.php
index 359990a2..8044b018 100644
--- a/data/web/lang/lang.en.php
+++ b/data/web/lang/lang.en.php
@@ -451,6 +451,7 @@ $lang['add']['delete2duplicates'] = 'Delete duplicates on destination';
 $lang['add']['delete1'] = 'Delete from source when completed';
 $lang['add']['delete2'] = 'Delete messages on destination that are not on source';
 $lang['add']['custom_params'] = 'Custom parameters';
+$lang['add']['custom_params_hint'] = 'Right: --param=xy, wrong: --param xy';
 $lang['add']['subscribeall'] = 'Subscribe all folders';
 $lang['add']['timeout1'] = 'Timeout for connection to remote host';
 $lang['add']['timeout2'] = 'Timeout for connection to local host';
diff --git a/data/web/modals/mailbox.php b/data/web/modals/mailbox.php
index aeb88cca..123a5934 100644
--- a/data/web/modals/mailbox.php
+++ b/data/web/modals/mailbox.php
@@ -1,7 +1,7 @@
 <?php
 if (!isset($_SESSION['mailcow_cc_role'])) {
-	header('Location: /');
-	exit();
+  header('Location: /');
+  exit();
 }
 ?>
 <!-- add mailbox modal -->
@@ -85,53 +85,53 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
         <h3 class="modal-title"><?=$lang['mailbox']['add_domain'];?></h3>
       </div>
       <div class="modal-body">
-				<form class="form-horizontal" data-cached-form="true" data-id="add_domain" role="form">
-					<div class="form-group">
-						<label class="control-label col-sm-2" for="domain"><?=$lang['add']['domain'];?>:</label>
-						<div class="col-sm-10">
-						<input type="text" autocorrect="off" autocapitalize="none" class="form-control" name="domain" required>
-						</div>
-					</div>
-					<div class="form-group">
-						<label class="control-label col-sm-2" for="description"><?=$lang['add']['description'];?></label>
-						<div class="col-sm-10">
-						<input type="text" class="form-control" name="description" required>
-						</div>
-					</div>
-					<div class="form-group">
-						<label class="control-label col-sm-2" for="aliases"><?=$lang['add']['max_aliases'];?></label>
-						<div class="col-sm-10">
-						<input type="number" class="form-control" name="aliases" value="400" required>
-						</div>
-					</div>
-					<div class="form-group">
-						<label class="control-label col-sm-2" for="mailboxes"><?=$lang['add']['max_mailboxes'];?></label>
-						<div class="col-sm-10">
-						<input type="number" class="form-control" name="mailboxes" value="10" required>
-						</div>
-					</div>
-					<div class="form-group">
-						<label class="control-label col-sm-2" for="maxquota"><?=$lang['add']['mailbox_quota_m'];?></label>
-						<div class="col-sm-10">
-						<input type="number" class="form-control" name="maxquota" value="3072" required>
-						</div>
-					</div>
-					<div class="form-group">
-						<label class="control-label col-sm-2" for="quota"><?=$lang['add']['domain_quota_m'];?></label>
-						<div class="col-sm-10">
-						<input type="number" class="form-control" name="quota" value="10240" required>
-						</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="active" checked> <?=$lang['add']['active'];?></label>
-							</div>
-						</div>
-					</div>
+        <form class="form-horizontal" data-cached-form="true" data-id="add_domain" role="form">
+          <div class="form-group">
+            <label class="control-label col-sm-2" for="domain"><?=$lang['add']['domain'];?>:</label>
+            <div class="col-sm-10">
+            <input type="text" autocorrect="off" autocapitalize="none" class="form-control" name="domain" required>
+            </div>
+          </div>
+          <div class="form-group">
+            <label class="control-label col-sm-2" for="description"><?=$lang['add']['description'];?></label>
+            <div class="col-sm-10">
+            <input type="text" class="form-control" name="description" required>
+            </div>
+          </div>
+          <div class="form-group">
+            <label class="control-label col-sm-2" for="aliases"><?=$lang['add']['max_aliases'];?></label>
+            <div class="col-sm-10">
+            <input type="number" class="form-control" name="aliases" value="400" required>
+            </div>
+          </div>
+          <div class="form-group">
+            <label class="control-label col-sm-2" for="mailboxes"><?=$lang['add']['max_mailboxes'];?></label>
+            <div class="col-sm-10">
+            <input type="number" class="form-control" name="mailboxes" value="10" required>
+            </div>
+          </div>
+          <div class="form-group">
+            <label class="control-label col-sm-2" for="maxquota"><?=$lang['add']['mailbox_quota_m'];?></label>
+            <div class="col-sm-10">
+            <input type="number" class="form-control" name="maxquota" value="3072" required>
+            </div>
+          </div>
+          <div class="form-group">
+            <label class="control-label col-sm-2" for="quota"><?=$lang['add']['domain_quota_m'];?></label>
+            <div class="col-sm-10">
+            <input type="number" class="form-control" name="quota" value="10240" required>
+            </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="active" checked> <?=$lang['add']['active'];?></label>
+              </div>
+            </div>
+          </div>
           <hr>
-					<div class="form-group">
-						<label class="control-label col-sm-2" for="rl_frame"><?=$lang['acl']['ratelimit'];?></label>
+          <div class="form-group">
+            <label class="control-label col-sm-2" for="rl_frame"><?=$lang['acl']['ratelimit'];?></label>
             <div class="col-sm-7">
             <input name="rl_value" type="number" value="<?=(!empty($rl['value'])) ? $rl['value'] : null;?>" class="form-control" placeholder="disabled">
             </div>
@@ -144,26 +144,26 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
             </div>
           </div>
           <hr>
-					<div class="form-group">
-						<label class="control-label col-sm-2"><?=$lang['add']['backup_mx_options'];?></label>
-						<div class="col-sm-10">
-							<div class="checkbox">
-							<label><input type="checkbox" value="1" name="backupmx"> <?=$lang['add']['relay_domain'];?></label>
-							<br />
-							<label><input type="checkbox" value="1" name="relay_all_recipients"> <?=$lang['add']['relay_all'];?></label>
-							<p><?=$lang['add']['relay_all_info'];?></p>
-							</div>
-						</div>
-					</div>
+          <div class="form-group">
+            <label class="control-label col-sm-2"><?=$lang['add']['backup_mx_options'];?></label>
+            <div class="col-sm-10">
+              <div class="checkbox">
+              <label><input type="checkbox" value="1" name="backupmx"> <?=$lang['add']['relay_domain'];?></label>
+              <br />
+              <label><input type="checkbox" value="1" name="relay_all_recipients"> <?=$lang['add']['relay_all'];?></label>
+              <p><?=$lang['add']['relay_all_info'];?></p>
+              </div>
+            </div>
+          </div>
           <hr>
-					<div class="form-group">
-						<div class="col-sm-offset-2 col-sm-10">
+          <div class="form-group">
+            <div class="col-sm-offset-2 col-sm-10">
               <button class="btn btn-default" data-action="add_item" data-id="add_domain" data-api-url='add/domain' data-api-attr='{}' href="#"><?=$lang['add']['add_domain_only'];?></button>
               <button class="btn btn-default" data-action="add_item" data-id="add_domain" data-api-url='add/domain' data-api-attr='{"restart_sogo":"1"}' href="#"><?=$lang['add']['add_domain_restart'];?></button>
-						</div>
-					</div>
-					<p><span class="glyphicon glyphicon-exclamation-sign text-danger"></span> <?=$lang['add']['restart_sogo_hint'];?></p>
-				</form>
+            </div>
+          </div>
+          <p><span class="glyphicon glyphicon-exclamation-sign text-danger"></span> <?=$lang['add']['restart_sogo_hint'];?></p>
+        </form>
       </div>
     </div>
   </div>
@@ -177,63 +177,63 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
         <h3 class="modal-title"><?=$lang['mailbox']['add_resource'];?></h3>
       </div>
       <div class="modal-body">
-				<form class="form-horizontal" data-cached-form="true" role="form" data-id="add_resource">
-					<div class="form-group">
-						<label class="control-label col-sm-2" for="description"><?=$lang['add']['description'];?></label>
-						<div class="col-sm-10">
-							<input type="text" class="form-control" name="description" required>
-						</div>
-					</div>
-					<div class="form-group">
-						<label class="control-label col-sm-2" for="domain"><?=$lang['add']['domain'];?>:</label>
-						<div class="col-sm-10">
-							<select data-live-search="true" name="domain" title="<?=$lang['add']['select'];?>" required>
-							<?php
+        <form class="form-horizontal" data-cached-form="true" role="form" data-id="add_resource">
+          <div class="form-group">
+            <label class="control-label col-sm-2" for="description"><?=$lang['add']['description'];?></label>
+            <div class="col-sm-10">
+              <input type="text" class="form-control" name="description" required>
+            </div>
+          </div>
+          <div class="form-group">
+            <label class="control-label col-sm-2" for="domain"><?=$lang['add']['domain'];?>:</label>
+            <div class="col-sm-10">
+              <select data-live-search="true" name="domain" title="<?=$lang['add']['select'];?>" required>
+              <?php
               foreach (mailbox('get', 'domains') as $domain) {
-								echo "<option>".htmlspecialchars($domain)."</option>";
-							}
-							?>
-							</select>
-						</div>
-					</div>
-					<div class="form-group">
-						<label class="control-label col-sm-2" for="domain"><?=$lang['add']['kind'];?>:</label>
-						<div class="col-sm-10">
-							<select name="kind" title="<?=$lang['add']['select'];?>" required>
-								<option value="location">Location</option>
-								<option value="group">Group</option>
-								<option value="thing">Thing</option>
-							</select>
-						</div>
-					</div>
-					<div class="form-group">
-						<label class="control-label col-sm-2" for="multiple_bookings_select"><?=$lang['add']['multiple_bookings'];?>:</label>
-						<div class="col-sm-10">
-							<select name="multiple_bookings_select" id="multiple_bookings_select" title="<?=$lang['add']['select'];?>" required>
-								<option value="0"><?=$lang['mailbox']['booking_0'];?></option>
-								<option value="-1" selected><?=$lang['mailbox']['booking_lt0'];?></option>
-								<option value="custom"><?=$lang['mailbox']['booking_custom'];?></option>
-							</select>
+                echo "<option>".htmlspecialchars($domain)."</option>";
+              }
+              ?>
+              </select>
+            </div>
+          </div>
+          <div class="form-group">
+            <label class="control-label col-sm-2" for="domain"><?=$lang['add']['kind'];?>:</label>
+            <div class="col-sm-10">
+              <select name="kind" title="<?=$lang['add']['select'];?>" required>
+                <option value="location">Location</option>
+                <option value="group">Group</option>
+                <option value="thing">Thing</option>
+              </select>
+            </div>
+          </div>
+          <div class="form-group">
+            <label class="control-label col-sm-2" for="multiple_bookings_select"><?=$lang['add']['multiple_bookings'];?>:</label>
+            <div class="col-sm-10">
+              <select name="multiple_bookings_select" id="multiple_bookings_select" title="<?=$lang['add']['select'];?>" required>
+                <option value="0"><?=$lang['mailbox']['booking_0'];?></option>
+                <option value="-1" selected><?=$lang['mailbox']['booking_lt0'];?></option>
+                <option value="custom"><?=$lang['mailbox']['booking_custom'];?></option>
+              </select>
               <div style="display:none" id="multiple_bookings_custom_div">
                 <hr>
                 <input type="number" class="form-control" name="multiple_bookings_custom" id="multiple_bookings_custom">
               </div>
               <input type="hidden" name="multiple_bookings" id="multiple_bookings">
-						</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="active" checked> <?=$lang['add']['active'];?></label>
-							</div>
-						</div>
-					</div>
-					<div class="form-group">
-						<div class="col-sm-offset-2 col-sm-10">
+            </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="active" checked> <?=$lang['add']['active'];?></label>
+              </div>
+            </div>
+          </div>
+          <div class="form-group">
+            <div class="col-sm-offset-2 col-sm-10">
               <button class="btn btn-default" data-action="add_item" data-id="add_resource" data-api-url='add/resource' data-api-attr='{}' href="#"><?=$lang['admin']['add'];?></button>
-						</div>
-					</div>
-				</form>
+            </div>
+          </div>
+        </form>
       </div>
     </div>
   </div>
@@ -247,44 +247,44 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
         <h3 class="modal-title"><?=$lang['mailbox']['add_alias'];?></h3>
       </div>
       <div class="modal-body">
-				<form class="form-horizontal" data-cached-form="true" role="form" data-id="add_alias">
-					<input type="hidden" value="0" name="active">
-					<div class="form-group">
-						<label class="control-label col-sm-2" for="address"><?=$lang['add']['alias_address'];?></label>
-						<div class="col-sm-10">
-							<textarea autocorrect="off" autocapitalize="none" class="form-control" rows="5" name="address" id="address" required></textarea>
-							<p><?=$lang['add']['alias_address_info'];?></p>
-						</div>
-					</div>
-					<div class="form-group">
-						<label class="control-label col-sm-2" for="goto"><?=$lang['add']['target_address'];?></label>
-						<div class="col-sm-10">
-							<textarea id="textarea_alias_goto" autocorrect="off" autocapitalize="none" class="form-control" rows="5" id="goto" name="goto" required></textarea>
-							<p><?=$lang['add']['target_address_info'];?></p>
-							<div class="checkbox">
+        <form class="form-horizontal" data-cached-form="true" role="form" data-id="add_alias">
+          <input type="hidden" value="0" name="active">
+          <div class="form-group">
+            <label class="control-label col-sm-2" for="address"><?=$lang['add']['alias_address'];?></label>
+            <div class="col-sm-10">
+              <textarea autocorrect="off" autocapitalize="none" class="form-control" rows="5" name="address" id="address" required></textarea>
+              <p><?=$lang['add']['alias_address_info'];?></p>
+            </div>
+          </div>
+          <div class="form-group">
+            <label class="control-label col-sm-2" for="goto"><?=$lang['add']['target_address'];?></label>
+            <div class="col-sm-10">
+              <textarea id="textarea_alias_goto" autocorrect="off" autocapitalize="none" class="form-control" rows="5" id="goto" name="goto" required></textarea>
+              <p><?=$lang['add']['target_address_info'];?></p>
+              <div class="checkbox">
                 <label><input class="goto_checkbox" type="checkbox" value="1" name="goto_null"> <?=$lang['add']['goto_null'];?></label>
-							</div>
+              </div>
               <div class="checkbox">
                 <label><input class="goto_checkbox" type="checkbox" value="1" name="goto_spam"> <?=$lang['add']['goto_spam'];?></label>
-							</div>
+              </div>
               <div class="checkbox">
                 <label><input class="goto_checkbox" type="checkbox" value="1" name="goto_ham"> <?=$lang['add']['goto_ham'];?></label>
-							</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="active" checked> <?=$lang['add']['active'];?></label>
-							</div>
-						</div>
-					</div>
-					<div class="form-group">
-						<div class="col-sm-offset-2 col-sm-10">
+              </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="active" checked> <?=$lang['add']['active'];?></label>
+              </div>
+            </div>
+          </div>
+          <div class="form-group">
+            <div class="col-sm-offset-2 col-sm-10">
               <button class="btn btn-default" data-action="add_item" data-id="add_alias" data-api-url='add/alias' data-api-attr='{}' href="#"><?=$lang['admin']['add'];?></button>
-						</div>
-					</div>
-				</form>
+            </div>
+          </div>
+        </form>
       </div>
     </div>
   </div>
@@ -298,37 +298,37 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
         <h3 class="modal-title"><?=$lang['mailbox']['add_domain_alias'];?></h3>
       </div>
       <div class="modal-body">
-				<form class="form-horizontal" data-cached-form="true" role="form" data-id="add_alias_domain">
-					<input type="hidden" value="0" name="active">
-					<div class="form-group">
-						<label class="control-label col-sm-2" for="alias_domain"><?=$lang['add']['alias_domain'];?></label>
-						<div class="col-sm-10">
-							<textarea autocorrect="off" autocapitalize="none" class="form-control" rows="5" name="alias_domain" id="alias_domain" required></textarea>
-							<p><?=$lang['add']['alias_domain_info'];?></p>
-						</div>
-					</div>
-					<div class="form-group">
-						<label class="control-label col-sm-2" for="target_domain"><?=$lang['add']['target_domain'];?></label>
-						<div class="col-sm-10">
-							<select data-live-search="true" name="target_domain" title="<?=$lang['add']['select'];?>" required>
-							<?php
+        <form class="form-horizontal" data-cached-form="true" role="form" data-id="add_alias_domain">
+          <input type="hidden" value="0" name="active">
+          <div class="form-group">
+            <label class="control-label col-sm-2" for="alias_domain"><?=$lang['add']['alias_domain'];?></label>
+            <div class="col-sm-10">
+              <textarea autocorrect="off" autocapitalize="none" class="form-control" rows="5" name="alias_domain" id="alias_domain" required></textarea>
+              <p><?=$lang['add']['alias_domain_info'];?></p>
+            </div>
+          </div>
+          <div class="form-group">
+            <label class="control-label col-sm-2" for="target_domain"><?=$lang['add']['target_domain'];?></label>
+            <div class="col-sm-10">
+              <select data-live-search="true" name="target_domain" title="<?=$lang['add']['select'];?>" required>
+              <?php
               foreach (mailbox('get', 'domains') as $domain) {
-								echo "<option>".htmlspecialchars($domain)."</option>";
-							}
-							?>
-							</select>
-						</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="active" checked> <?=$lang['add']['active'];?></label>
-							</div>
-						</div>
-					</div>
+                echo "<option>".htmlspecialchars($domain)."</option>";
+              }
+              ?>
+              </select>
+            </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="active" checked> <?=$lang['add']['active'];?></label>
+              </div>
+            </div>
+          </div>
           <hr>
-					<div class="form-group">
-						<label class="control-label col-sm-2" for="rl_frame"><?=$lang['acl']['ratelimit'];?></label>
+          <div class="form-group">
+            <label class="control-label col-sm-2" for="rl_frame"><?=$lang['acl']['ratelimit'];?></label>
             <div class="col-sm-7">
             <input name="rl_value" type="number" value="<?=(!empty($rl['value'])) ? $rl['value'] : null;?>" class="form-control" placeholder="disabled">
             </div>
@@ -340,12 +340,12 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
             </select>
             </div>
           </div>
-					<div class="form-group">
-						<div class="col-sm-offset-2 col-sm-10">
+          <div class="form-group">
+            <div class="col-sm-offset-2 col-sm-10">
               <button class="btn btn-default" data-action="add_item" data-id="add_alias_domain" data-api-url='add/alias-domain' data-api-attr='{}' href="#"><?=$lang['admin']['add'];?></button>
-						</div>
-					</div>
-				</form>
+            </div>
+          </div>
+        </form>
       </div>
     </div>
   </div>
@@ -360,7 +360,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
       </div>
       <div class="modal-body">
         <p class="help-block"><?=$lang['add']['syncjob_hint'];?></p>
-				<form class="form-horizontal" data-cached-form="true" role="form" data-id="add_syncjob">
+        <form class="form-horizontal" data-cached-form="true" role="form" data-id="add_syncjob">
           <div class="form-group">
             <label class="control-label col-sm-2" for="username"><?=$lang['add']['username'];?>:</label>
             <div class="col-sm-10">
@@ -379,149 +379,150 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
               </select>
             </div>
           </div> 
-					<div class="form-group">
-						<label class="control-label col-sm-2" for="host1"><?=$lang['add']['hostname'];?></label>
-						<div class="col-sm-10">
-						<input type="text" class="form-control" name="host1" required>
-						</div>
-					</div>
-					<div class="form-group">
-						<label class="control-label col-sm-2" for="port1"><?=$lang['add']['port'];?></label>
-						<div class="col-sm-10">
-						<input type="number" class="form-control" name="port1" min="1" max="65535" value="143" required>
+          <div class="form-group">
+            <label class="control-label col-sm-2" for="host1"><?=$lang['add']['hostname'];?></label>
+            <div class="col-sm-10">
+            <input type="text" class="form-control" name="host1" required>
+            </div>
+          </div>
+          <div class="form-group">
+            <label class="control-label col-sm-2" for="port1"><?=$lang['add']['port'];?></label>
+            <div class="col-sm-10">
+            <input type="number" class="form-control" name="port1" min="1" max="65535" value="143" required>
             <small class="help-block">1-65535</small>
-						</div>
-					</div>
-					<div class="form-group">
-						<label class="control-label col-sm-2" for="user1"><?=$lang['add']['username'];?></label>
-						<div class="col-sm-10">
-						<input type="text" class="form-control" name="user1" required>
-						</div>
-					</div>
-					<div class="form-group">
-						<label class="control-label col-sm-2" for="password1"><?=$lang['add']['password'];?></label>
-						<div class="col-sm-10">
-						<input type="password" class="form-control" name="password1" required>
-						</div>
-					</div>
-					<div class="form-group">
-						<label class="control-label col-sm-2" for="enc1"><?=$lang['add']['enc_method'];?></label>
-						<div class="col-sm-10">
-							<select name="enc1" title="<?=$lang['add']['select'];?>" required>
+            </div>
+          </div>
+          <div class="form-group">
+            <label class="control-label col-sm-2" for="user1"><?=$lang['add']['username'];?></label>
+            <div class="col-sm-10">
+            <input type="text" class="form-control" name="user1" required>
+            </div>
+          </div>
+          <div class="form-group">
+            <label class="control-label col-sm-2" for="password1"><?=$lang['add']['password'];?></label>
+            <div class="col-sm-10">
+            <input type="password" class="form-control" name="password1" required>
+            </div>
+          </div>
+          <div class="form-group">
+            <label class="control-label col-sm-2" for="enc1"><?=$lang['add']['enc_method'];?></label>
+            <div class="col-sm-10">
+              <select name="enc1" title="<?=$lang['add']['select'];?>" required>
                 <option selected>TLS</option>
                 <option>SSL</option>
                 <option>PLAIN</option>
-							</select>
-						</div>
-					</div>
-					<div class="form-group">
-						<label class="control-label col-sm-2" for="mins_interval"><?=$lang['add']['mins_interval'];?></label>
-						<div class="col-sm-10">
+              </select>
+            </div>
+          </div>
+          <div class="form-group">
+            <label class="control-label col-sm-2" for="mins_interval"><?=$lang['add']['mins_interval'];?></label>
+            <div class="col-sm-10">
               <input type="number" class="form-control" name="mins_interval" min="1" max="3600" value="20" required>
               <small class="help-block">1-3600</small>
-						</div>
-					</div>
-					<div class="form-group">
-						<label class="control-label col-sm-2" for="subfolder2"><?=$lang['edit']['subfolder2'];?></label>
-						<div class="col-sm-10">
-						<input type="text" class="form-control" name="subfolder2" value="External">
-						</div>
-					</div>
-					<div class="form-group">
-						<label class="control-label col-sm-2" for="maxage"><?=$lang['edit']['maxage'];?></label>
-						<div class="col-sm-10">
-						<input type="number" class="form-control" name="maxage" min="0" max="32000" value="0">
+            </div>
+          </div>
+          <div class="form-group">
+            <label class="control-label col-sm-2" for="subfolder2"><?=$lang['edit']['subfolder2'];?></label>
+            <div class="col-sm-10">
+            <input type="text" class="form-control" name="subfolder2" value="External">
+            </div>
+          </div>
+          <div class="form-group">
+            <label class="control-label col-sm-2" for="maxage"><?=$lang['edit']['maxage'];?></label>
+            <div class="col-sm-10">
+            <input type="number" class="form-control" name="maxage" min="0" max="32000" value="0">
             <small class="help-block">0-32000</small>
-						</div>
-					</div>
-					<div class="form-group">
-						<label class="control-label col-sm-2" for="maxbytespersecond"><?=$lang['edit']['maxbytespersecond'];?></label>
-						<div class="col-sm-10">
-						<input type="number" class="form-control" name="maxbytespersecond" min="0" max="125000000" value="0">
+            </div>
+          </div>
+          <div class="form-group">
+            <label class="control-label col-sm-2" for="maxbytespersecond"><?=$lang['edit']['maxbytespersecond'];?></label>
+            <div class="col-sm-10">
+            <input type="number" class="form-control" name="maxbytespersecond" min="0" max="125000000" value="0">
             <small class="help-block">0-125000000</small>
-						</div>
-					</div>
-					<div class="form-group">
-						<label class="control-label col-sm-2" for="timeout1"><?=$lang['edit']['timeout1'];?></label>
-						<div class="col-sm-10">
-						<input type="number" class="form-control" name="timeout1" min="1" max="32000" value="600">
+            </div>
+          </div>
+          <div class="form-group">
+            <label class="control-label col-sm-2" for="timeout1"><?=$lang['edit']['timeout1'];?></label>
+            <div class="col-sm-10">
+            <input type="number" class="form-control" name="timeout1" min="1" max="32000" value="600">
             <small class="help-block">1-32000</small>
-						</div>
-					</div>
+            </div>
+          </div>
           <div class="form-group">
-						<label class="control-label col-sm-2" for="timeout2"><?=$lang['edit']['timeout2'];?></label>
-						<div class="col-sm-10">
-						<input type="number" class="form-control" name="timeout2" min="1" max="32000" value="600">
+            <label class="control-label col-sm-2" for="timeout2"><?=$lang['edit']['timeout2'];?></label>
+            <div class="col-sm-10">
+            <input type="number" class="form-control" name="timeout2" min="1" max="32000" value="600">
             <small class="help-block">1-32000</small>
-						</div>
-					</div>
-					<div class="form-group">
-						<label class="control-label col-sm-2" for="exclude"><?=$lang['add']['exclude'];?></label>
-						<div class="col-sm-10">
-						<input type="text" class="form-control" name="exclude" value="(?i)spam|(?i)junk">
-						</div>
-					</div>
-					<div class="form-group">
-						<label class="control-label col-sm-2" for="custom_params"><?=$lang['add']['custom_params'];?></label>
-						<div class="col-sm-10">
-						<input type="text" class="form-control" name="custom_params" placeholder="--delete2folders --otheroption">
-						</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="delete2duplicates" checked> <?=$lang['add']['delete2duplicates'];?> (--delete2duplicates)</label>
-							</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="delete1"> <?=$lang['add']['delete1'];?> (--delete1)</label>
-							</div>
-						</div>
-					</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="delete2"> <?=$lang['add']['delete2'];?> (--delete2)</label>
-							</div>
-						</div>
-					</div>
+            <label class="control-label col-sm-2" for="exclude"><?=$lang['add']['exclude'];?></label>
+            <div class="col-sm-10">
+            <input type="text" class="form-control" name="exclude" value="(?i)spam|(?i)junk">
+            </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="automap" checked> <?=$lang['add']['automap'];?> (--automap)</label>
-							</div>
-						</div>
-					</div>
+            <label class="control-label col-sm-2" for="custom_params"><?=$lang['add']['custom_params'];?></label>
+            <div class="col-sm-10">
+            <input type="text" class="form-control" name="custom_params" placeholder="--dry --some-param=xy --other-param=yx">
+            <small class="help-block"><?=$lang['add']['custom_params_hint'];?></small>
+            </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="skipcrossduplicates"> <?=$lang['add']['skipcrossduplicates'];?> (--skipcrossduplicates)</label>
-							</div>
-						</div>
-					</div>
+            <div class="col-sm-offset-2 col-sm-10">
+              <div class="checkbox">
+              <label><input type="checkbox" value="1" name="delete2duplicates" checked> <?=$lang['add']['delete2duplicates'];?> (--delete2duplicates)</label>
+              </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="subscribeall" checked> <?=$lang['add']['subscribeall'];?> (--subscribeall)</label>
-							</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="active" checked> <?=$lang['add']['active'];?></label>
-							</div>
-						</div>
-					</div>
-					<div class="form-group">
-						<div class="col-sm-offset-2 col-sm-10">
+            <div class="col-sm-offset-2 col-sm-10">
+              <div class="checkbox">
+              <label><input type="checkbox" value="1" name="delete1"> <?=$lang['add']['delete1'];?> (--delete1)</label>
+              </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="delete2"> <?=$lang['add']['delete2'];?> (--delete2)</label>
+              </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="automap" checked> <?=$lang['add']['automap'];?> (--automap)</label>
+              </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="skipcrossduplicates"> <?=$lang['add']['skipcrossduplicates'];?> (--skipcrossduplicates)</label>
+              </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="subscribeall" checked> <?=$lang['add']['subscribeall'];?> (--subscribeall)</label>
+              </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="active" checked> <?=$lang['add']['active'];?></label>
+              </div>
+            </div>
+          </div>
+          <div class="form-group">
+            <div class="col-sm-offset-2 col-sm-10">
               <button class="btn btn-default" data-action="add_item" data-id="add_syncjob" data-api-url='add/syncjob' data-api-attr='{}' href="#"><?=$lang['admin']['add'];?></button>
-						</div>
-					</div>
-				</form>
+            </div>
+          </div>
+        </form>
       </div>
     </div>
   </div>
@@ -535,7 +536,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
         <h3 class="modal-title">Filter</h3>
       </div>
       <div class="modal-body">
-				<form class="form-horizontal" data-cached-form="true" role="form" data-id="add_filter">
+        <form class="form-horizontal" data-cached-form="true" role="form" data-id="add_filter">
           <div class="form-group">
             <label class="control-label col-sm-2" for="username"><?=$lang['add']['username'];?>:</label>
             <div class="col-sm-10">
@@ -563,33 +564,33 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
               </select>
             </div>
           </div>
-					<div class="form-group">
-						<label class="control-label col-sm-2" for="script_desc"><?=$lang['add']['sieve_desc'];?>:</label>
-						<div class="col-sm-10">
-						<input type="text" class="form-control" name="script_desc" required maxlength="255">
-						</div>
-					</div>
-					<div class="form-group">
-						<label class="control-label col-sm-2" for="script_data">Script:</label>
-						<div class="col-sm-10">
-							<textarea autocorrect="off" spellcheck="false" autocapitalize="none" class="form-control textarea-code" rows="20" id="script_data" name="script_data" required></textarea>
-						</div>
-					</div>
-					<div class="form-group">
-						<div class="col-sm-offset-2 col-sm-10">
+          <div class="form-group">
+            <label class="control-label col-sm-2" for="script_desc"><?=$lang['add']['sieve_desc'];?>:</label>
+            <div class="col-sm-10">
+            <input type="text" class="form-control" name="script_desc" required maxlength="255">
+            </div>
+          </div>
+          <div class="form-group">
+            <label class="control-label col-sm-2" for="script_data">Script:</label>
+            <div class="col-sm-10">
+              <textarea autocorrect="off" spellcheck="false" autocapitalize="none" class="form-control textarea-code" rows="20" id="script_data" name="script_data" required></textarea>
+            </div>
+          </div>
+          <div class="form-group">
+            <div class="col-sm-offset-2 col-sm-10">
               <p class="help-block"><?=$lang['add']['activate_filter_warn'];?></p>
-							<div class="checkbox">
-							<label><input type="checkbox" value="1" name="active" checked> <?=$lang['add']['active'];?></label>
-							</div>
-						</div>
-					</div>
-					<div class="form-group">
-						<div class="col-sm-offset-2 col-sm-10" id="add_filter_btns">
+              <div class="checkbox">
+              <label><input type="checkbox" value="1" name="active" checked> <?=$lang['add']['active'];?></label>
+              </div>
+            </div>
+          </div>
+          <div class="form-group">
+            <div class="col-sm-offset-2 col-sm-10" id="add_filter_btns">
               <button class="btn btn-default" id="validate_sieve" href="#"><?=$lang['add']['validate'];?></button>
               <button class="btn btn-success" id="add_sieve_script" data-action="add_item" data-id="add_filter" data-api-url='add/filter' data-api-attr='{}' href="#" disabled><?=$lang['admin']['add'];?></button>
-						</div>
-					</div>
-				</form>
+            </div>
+          </div>
+        </form>
       </div>
     </div>
   </div>
@@ -603,7 +604,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
         <h3 class="modal-title"><?=$lang['mailbox']['bcc_maps'];?></h3>
       </div>
       <div class="modal-body">
-				<form class="form-horizontal" data-cached-form="true" role="form" data-id="add_bcc">
+        <form class="form-horizontal" data-cached-form="true" role="form" data-id="add_bcc">
           <div class="form-group">
             <label class="control-label col-sm-2" for="local_dest"><?=$lang['mailbox']['bcc_local_dest'];?>:</label>
             <div class="col-sm-10">
@@ -642,25 +643,25 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
               </select>
             </div>
           </div>
-					<div class="form-group">
-						<label class="control-label col-sm-2" for="bcc_dest"><?=$lang['mailbox']['bcc_destination'];?>:</label>
-						<div class="col-sm-10">
+          <div class="form-group">
+            <label class="control-label col-sm-2" for="bcc_dest"><?=$lang['mailbox']['bcc_destination'];?>:</label>
+            <div class="col-sm-10">
               <input type="text" class="form-control" name="bcc_dest">
-						</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="active" checked> <?=$lang['add']['active'];?></label>
-							</div>
-						</div>
-					</div>
-					<div class="form-group">
-						<div class="col-sm-offset-2 col-sm-10">
+            </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="active" checked> <?=$lang['add']['active'];?></label>
+              </div>
+            </div>
+          </div>
+          <div class="form-group">
+            <div class="col-sm-offset-2 col-sm-10">
               <button class="btn btn-success" data-action="add_item" data-id="add_bcc" data-api-url='add/bcc' data-api-attr='{}' href="#"><?=$lang['admin']['add'];?></button>
-						</div>
-					</div>
-				</form>
+            </div>
+          </div>
+        </form>
       </div>
     </div>
   </div>
@@ -674,7 +675,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
         <h3 class="modal-title"><?=$lang['mailbox']['recipient_maps'];?></h3>
       </div>
       <div class="modal-body">
-				<form class="form-horizontal" data-cached-form="true" role="form" data-id="add_recipient_map">
+        <form class="form-horizontal" data-cached-form="true" role="form" data-id="add_recipient_map">
           <div class="form-group">
             <label class="control-label col-sm-2" for="recipient_map_old"><?=$lang['mailbox']['recipient_map_old'];?></label>
             <div class="col-sm-10">
@@ -689,19 +690,19 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
             <small><?=$lang['mailbox']['recipient_map_new_info'];?></small>
             </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="active" checked> <?=$lang['add']['active'];?></label>
-							</div>
-						</div>
-					</div>
-					<div class="form-group">
-						<div class="col-sm-offset-2 col-sm-10">
+          <div class="form-group">
+            <div class="col-sm-offset-2 col-sm-10">
+              <div class="checkbox">
+              <label><input type="checkbox" value="1" name="active" checked> <?=$lang['add']['active'];?></label>
+              </div>
+            </div>
+          </div>
+          <div class="form-group">
+            <div class="col-sm-offset-2 col-sm-10">
               <button class="btn btn-success" data-action="add_item" data-id="add_recipient_map" data-api-url='add/recipient_map' data-api-attr='{}' href="#"><?=$lang['admin']['add'];?></button>
-						</div>
-					</div>
-				</form>
+            </div>
+          </div>
+        </form>
       </div>
     </div>
   </div>
@@ -715,7 +716,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
         <h3 class="modal-title"><?=$lang['mailbox']['tls_policy_maps'];?></h3>
       </div>
       <div class="modal-body">
-				<form class="form-horizontal" data-cached-form="true" role="form" data-id="add_tls_policy_map">
+        <form class="form-horizontal" data-cached-form="true" role="form" data-id="add_tls_policy_map">
           <div class="form-group">
             <label class="control-label col-sm-2" for="dest"><?=$lang['mailbox']['tls_map_dest'];?></label>
             <div class="col-sm-10">
@@ -745,19 +746,19 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
             <small><?=$lang['mailbox']['tls_map_parameters_info'];?></small>
             </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="active" checked> <?=$lang['add']['active'];?></label>
-							</div>
-						</div>
-					</div>
-					<div class="form-group">
-						<div class="col-sm-offset-2 col-sm-10">
+          <div class="form-group">
+            <div class="col-sm-offset-2 col-sm-10">
+              <div class="checkbox">
+              <label><input type="checkbox" value="1" name="active" checked> <?=$lang['add']['active'];?></label>
+              </div>
+            </div>
+          </div>
+          <div class="form-group">
+            <div class="col-sm-offset-2 col-sm-10">
               <button class="btn btn-success" data-action="add_item" data-id="add_tls_policy_map" data-api-url='add/tls-policy-map' data-api-attr='{}' href="#"><?=$lang['admin']['add'];?></button>
-						</div>
-					</div>
-				</form>
+            </div>
+          </div>
+        </form>
       </div>
     </div>
   </div>