diff --git a/res/layout/message_compose.xml b/res/layout/message_compose.xml
index cfd4850ab..e5fd3e552 100644
--- a/res/layout/message_compose.xml
+++ b/res/layout/message_compose.xml
@@ -91,17 +91,5 @@
                 android:layout_width="fill_parent" />
         </LinearLayout>
     </ScrollView>
-    <LinearLayout android:orientation="horizontal"
-        android:layout_width="fill_parent" android:layout_height="54px"
-        android:background="@drawable/bottombar_565" android:gravity="center_vertical">
-        <Button android:id="@+id/send" android:text="@string/send_action"
-            android:layout_height="wrap_content" android:layout_width="0dip"
-            android:layout_weight="1" />
-        <Button android:id="@+id/save" android:text="@string/save_draft_action"
-            android:layout_height="wrap_content" android:layout_width="0dip"
-            android:layout_weight="1" />
-        <Button android:id="@+id/discard" android:text="@string/discard_action"
-            android:layout_height="wrap_content" android:layout_width="0dip"
-            android:layout_weight="1" />
-    </LinearLayout>
+
 </LinearLayout>
diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java
index f67736326..153a8e419 100644
--- a/src/com/fsck/k9/activity/MessageCompose.java
+++ b/src/com/fsck/k9/activity/MessageCompose.java
@@ -262,9 +262,9 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
         mBccView = (MultiAutoCompleteTextView)findViewById(R.id.bcc);
         mSubjectView = (EditText)findViewById(R.id.subject);
         mMessageContentView = (EditText)findViewById(R.id.message_content);
-        mSendButton = (Button)findViewById(R.id.send);
-        mDiscardButton = (Button)findViewById(R.id.discard);
-        mSaveButton = (Button)findViewById(R.id.save);
+//         mSendButton = (Button)findViewById(R.id.send);
+//         mDiscardButton = (Button)findViewById(R.id.discard);
+//         mSaveButton = (Button)findViewById(R.id.save);
         mAttachments = (LinearLayout)findViewById(R.id.attachments);
         mQuotedTextBar = findViewById(R.id.quoted_text_bar);
         mQuotedTextDelete = (ImageButton)findViewById(R.id.quoted_text_delete);
@@ -309,9 +309,9 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
         mBccView.setTokenizer(new Rfc822Tokenizer());
         mBccView.setValidator(mAddressValidator);
 
-        mSendButton.setOnClickListener(this);
-        mDiscardButton.setOnClickListener(this);
-        mSaveButton.setOnClickListener(this);
+//         mSendButton.setOnClickListener(this);
+//         mDiscardButton.setOnClickListener(this);
+//         mSaveButton.setOnClickListener(this);
 
         mSubjectView.setOnFocusChangeListener(this);
 
@@ -780,15 +780,15 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
 
     public void onClick(View view) {
         switch (view.getId()) {
-            case R.id.send:
-                onSend();
-                break;
-            case R.id.save:
-                onSave();
-                break;
-            case R.id.discard:
-                onDiscard();
-                break;
+//             case R.id.send:
+//                 onSend();
+//                 break;
+//             case R.id.save:
+//                 onSave();
+//                 break;
+//             case R.id.discard:
+//                 onDiscard();
+//                 break;
             case R.id.attachment_delete:
                 /*
                  * The view is the delete button, and we have previously set the tag of