Move sent-mail/read receipt down from button bar.

diff --git a/imp/templates/chunks/compose.php b/imp/templates/chunks/compose.php
index d82f304..d2023f2 100644 (file)
--- a/imp/templates/chunks/compose.php
+++ b/imp/templates/chunks/compose.php
@@ -52,16 +52,6 @@ function _createDAcompose($text, $image, $id)
  <span>
   <?php _createDAcompose(_("Send"), 'Forward', 'send_button') ?>
  </span>
-<?php if ($GLOBALS['conf']['compose']['allow_receipts'] && $d_read != 'never'): ?>
- <span>
-  <label><input type="checkbox" class="checkbox" name="request_read_receipt"<?php if ($d_read != 'ask') echo ' checked="checked"' ?> /> <?php echo _("Read Receipt") ?></label>
- </span>
-<?php endif; ?>
-<?php if ($GLOBALS['conf']['user']['allow_folders'] && !$GLOBALS['prefs']->isLocked('save_sent_mail')): ?>
-  <span>
-   <label><input type="checkbox" class="checkbox" id="save_sent_mail" name="save_sent_mail"<?php if ($identity->saveSentmail()) echo ' checked="checked"' ?> /> <?php echo _("Save in ") ?><span id="sent_mail_folder_label"><?php echo $sent_mail_folder ?></span></label>
-  </span>
-<?php endif; ?>
 <?php endif; ?>
  <span>
   <?php _createDAcompose(_("Check Spelling"), 'Spellcheck', 'spellcheck') ?>
@@ -77,7 +67,13 @@ function _createDAcompose($text, $image, $id)
    <label><input id="togglecc" name="togglecc" type="checkbox" class="checkbox" /> <?php echo _("Show Cc") ?></label>
    <label><input id="togglebcc" name="togglebcc" type="checkbox" class="checkbox" /> <?php echo _("Show Bcc") ?></label>
 <?php if ($rte): ?>
-   <label><input id="htmlcheckbox" type="checkbox" class="checkbox" <?php if ($compose_html) echo 'checked="checked"' ?> /> <?php echo _("HTML composition") ?></label>
+   <label><input id="htmlcheckbox" type="checkbox" class="checkbox"<?php if ($compose_html) echo 'checked="checked"' ?> /> <?php echo _("HTML composition") ?></label>
+<?php endif; ?>
+<?php if ($GLOBALS['conf']['compose']['allow_receipts'] && $d_read != 'never'): ?>
+   <label><input name="request_read_receipt" type="checkbox" class="checkbox"<?php if ($d_read != 'ask') echo ' checked="checked"' ?> /> <?php echo _("Read Receipt") ?></label>
+<?php endif; ?>
+<?php if ($GLOBALS['conf']['user']['allow_folders'] && !$GLOBALS['prefs']->isLocked('save_sent_mail')): ?>
+   <label><input id="save_sent_mail" name="save_sent_mail" type="checkbox" class="checkbox"<?php if ($identity->saveSentmail()) echo ' checked="checked"' ?> /> <?php echo _("Save in ") ?><span id="sent_mail_folder_label"><?php echo $sent_mail_folder ?></span></label>
 <?php endif; ?>
   </div>
   <table cellspacing="0">