diff --git a/themes/alps/compose.html b/themes/alps/compose.html
index 57e5a84..7b58a5f 100644
--- a/themes/alps/compose.html
+++ b/themes/alps/compose.html
@@ -5,6 +5,7 @@
 <div class="page-wrap">
   <aside>
     <a href="/compose" class="compose-mail active">Compose&nbsp;Mail</a>
+    <!-- TODO: use mailbox list from template data -->
     <a href="/mailbox/INBOX">Inbox</a>
     <a href="/mailbox/Drafts">Drafts</a>
     <a href="/mailbox/Sent">Sent</a>
@@ -18,17 +19,20 @@
 
       <form method="post" action="" enctype="multipart/form-data">
         <input type="hidden" name="in_reply_to" value="{{.Message.InReplyTo}}">
+
         <label><span>From</span><input type="email" name="from" id="from" value="{{.Message.From}}" /></label>
         <label><span>To</span><input type="email" name="to" id="to" value="{{.Message.ToString}}" multiple {{ if not .Message.To }} autofocus{{ end }}/></label>
         <label><span>Subject</span><input type="text" name="subject" id="subject" value="{{.Message.Subject}}" {{ if .Message.To }} autofocus{{ end }}/></label>
         <label><span>Attachments</span><input type="file" name="attachments" id="attachments" multiple></label>
+        <!-- TODO: list of previous attachments (needs design) -->
 
         <textarea name="text" class="body">{{.Message.Text}}</textarea>
 
         <div class="actions">
-          <button type="submit">Send Message</button>
+          <a href="/mailbox/INBOX">Cancel</a>
           &nbsp;&nbsp;
-          <a href="/mailbox/INBOX">Discard</a>
+          <button type="submit" name="save_as_draft">Save as draft</button>
+          <button type="submit">Send Message</button>
         </div>
       </form>