diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 8c7c7aa852..189fac64c5 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -211,6 +211,7 @@ public class ConversationActivity extends SherlockFragmentActivity {
     case R.id.menu_abort_session:        handleAbortSecureSession();                   return true;
     case R.id.menu_verify_recipient:     handleVerifyRecipient();                      return true;
     case R.id.menu_verify_session:       handleVerifySession();                        return true;
+    case android.R.id.home:              finish();                                     return true;
     }
 
     return false;