diff --git a/Signal/src/util/UIViewController+OWS.h b/Signal/src/util/UIViewController+OWS.h
index b95a4b48f..3d5bdef3b 100644
--- a/Signal/src/util/UIViewController+OWS.h
+++ b/Signal/src/util/UIViewController+OWS.h
@@ -8,7 +8,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface UIViewController (OWS)
 
+- (UIBarButtonItem *)createOWSBackButtonWithSelector:(SEL)selector;
 - (UIBarButtonItem *)createOWSBackButton;
+- (void)useOWSBackButtonWithSelector:(SEL)selector;
 - (void)useOWSBackButton;
 
 @end
diff --git a/Signal/src/util/UIViewController+OWS.m b/Signal/src/util/UIViewController+OWS.m
index 238e38afa..7789ecfa0 100644
--- a/Signal/src/util/UIViewController+OWS.m
+++ b/Signal/src/util/UIViewController+OWS.m
@@ -8,17 +8,27 @@ NS_ASSUME_NONNULL_BEGIN
 
 @implementation UIViewController (OWS)
 
-- (UIBarButtonItem *)createOWSBackButton
+- (UIBarButtonItem *)createOWSBackButtonWithSelector:(SEL)selector
 {
     UIImage *backImage = [UIImage imageNamed:@"NavBarBack"];
     OWSAssert(backImage);
     UIBarButtonItem *backItem = [[UIBarButtonItem alloc] initWithImage:backImage
                                                                  style:UIBarButtonItemStylePlain
                                                                 target:self
-                                                                action:@selector(backButtonPressed:)];
+                                                                action:selector];
     return backItem;
 }
 
+- (UIBarButtonItem *)createOWSBackButton
+{
+    return [self createOWSBackButtonWithSelector:@selector(backButtonPressed:)];
+}
+
+- (void)useOWSBackButtonWithSelector:(SEL)selector
+{
+    self.navigationItem.leftBarButtonItem = [self createOWSBackButtonWithSelector:selector];
+}
+
 - (void)useOWSBackButton
 {
     self.navigationItem.leftBarButtonItem = [self createOWSBackButton];
diff --git a/Signal/src/view controllers/MessageComposeTableViewController.m b/Signal/src/view controllers/MessageComposeTableViewController.m
index ed8d5bf59..ba5a5b1b1 100644
--- a/Signal/src/view controllers/MessageComposeTableViewController.m	
+++ b/Signal/src/view controllers/MessageComposeTableViewController.m	
@@ -117,7 +117,7 @@ NSString *const MessageComposeTableViewControllerCellContact = @"ContactTableVie
 - (void)viewDidLoad {
     [super viewDidLoad];
     [self.navigationController.navigationBar setTranslucent:NO];
-    [self useOWSBackButton];
+    [self useOWSBackButtonWithSelector:@selector(closeButton:)];
     
     self.navigationItem.rightBarButtonItem.accessibilityLabel = NSLocalizedString(
         @"CREATE_NEW_GROUP", @"Accessibility label for the create group new group button");
@@ -150,6 +150,11 @@ NSString *const MessageComposeTableViewControllerCellContact = @"ContactTableVie
     }
 }
 
+- (void)closeButton:(id)sender
+{
+    [self dismissViewControllerAnimated:YES completion:nil];
+}
+
 - (UILabel *)createLabelWithFirstLine:(NSString *)firstLine andSecondLine:(NSString *)secondLine {
     UILabel *label      = [[UILabel alloc] init];
     label.textColor     = [UIColor grayColor];