diff --git a/res/layout/message_view.xml b/res/layout/message_view.xml
index 86d20f6ff..1056d3c57 100644
--- a/res/layout/message_view.xml
+++ b/res/layout/message_view.xml
@@ -42,4 +42,29 @@
 
         </LinearLayout>
     </ScrollView>
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="57px"
+        android:background="@drawable/ic_email_thread_open_bottom_default"
+        android:gravity="center_vertical">
+        <Button
+            android:id="@+id/reply"
+            android:text="@string/reply_action"
+            android:layout_height="wrap_content"
+            android:layout_width="0dip"
+            android:layout_weight="1" />
+        <Button
+            android:id="@+id/reply_all"
+            android:text="@string/reply_all_action"
+            android:layout_height="wrap_content"
+            android:layout_width="0dip"
+            android:layout_weight="1" />
+        <Button
+            android:id="@+id/delete"
+            android:text="@string/delete_action"
+            android:layout_height="wrap_content"
+            android:layout_width="0dip"
+            android:layout_weight="1" />
+    </LinearLayout>
 </LinearLayout>
diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java
index a12d10089..d196e3278 100644
--- a/src/com/fsck/k9/activity/MessageView.java
+++ b/src/com/fsck/k9/activity/MessageView.java
@@ -288,6 +288,10 @@ public class MessageView extends Activity
         mMessageContentView.setVerticalScrollBarEnabled(false);
         mAttachments.setVisibility(View.GONE);
         mAttachmentIcon.setVisibility(View.GONE);
+
+        findViewById(R.id.reply).setOnClickListener(this);
+        findViewById(R.id.reply_all).setOnClickListener(this);
+        findViewById(R.id.delete).setOnClickListener(this);
         findViewById(R.id.show_pictures).setOnClickListener(this);
 
         // UrlInterceptRegistry.registerHandler(this);
@@ -499,6 +503,15 @@ public class MessageView extends Activity
 
     public void onClick(View view) {
         switch (view.getId()) {
+            case R.id.reply:
+                onReply();
+                break;
+            case R.id.reply_all:
+                onReplyAll();
+                break;
+            case R.id.delete:
+                onDelete();
+                break;
             case R.id.next:
                 onNext();
                 break;