-<div class="attachment buttons">
-<img src="static/diskette_24x.gif" class="imgedit" ><?_("Attachments:")>
-<select name="which_attachment" size=1>
-<?ITERATE("MSG:ATTACHNAMES", ="edit_message_section_attach_select")>
-</select>
- <?_("Attach file:")>
-<input name="attachfile" class="attachfile" size=16 type="file">
- <input type="submit" name="attach_button" value="<?_("Add")>">
- <input type="submit" name="remove_attach_button" value="<?_("Remove")>">
-
-</div></td></tr></table></form>
+</td></tr></table></form>
+
+<div style="display:none" id="submit-o-matic"><ul>
+<li>
+ <a href="javascript:submit_post('post');">
+ <img src="static/newmess3_24x.gif" alt="" width="24" height="24">
+ <span class="navbar_link">
+ <?!("COND:BSTR", 1, "__RCPTREQUIRED")><?_("Send message")><?!("X", 1)>
+ <??("COND:BSTR", 2, "__RCPTREQUIRED")><?_("Post message")><?!("X", 2)>
+ </span>
+ </a>
+</li>
+<li>
+ <a href="javascript:submit_post('draft');">
+ <img src="static/folder_closed.gif" alt="" width="24" height="24">
+ <span class="navbar_link">
+ <?_("Save to Drafts")>
+ </span>
+ </a>
+</li>
+<li>
+ <a href="javascript:submit_post('cancel');">
+ <img src="static/closewindow.gif" alt="">
+ <span class="navbar_link">
+ <?_("Cancel")>
+ </span>
+ </a>
+</li>
+<?!("COND:BSTR", 1, "__RCPTREQUIRED")><li>
+ <a href="javascript:PopOpenAddressBook('recp_id|<?_("To:")>|cc_id|<?_("CC:")>|bcc_id|<?_("BCC:")>');">
+ <img src="static/viewcontacts_24x.gif" alt="" width="24" height="24">
+ <span class="navbar_link">
+ <?_("Contacts")>
+ </span>
+ </a>
+</li><?!("X", 1)>
+</div>