diff --git a/Signal/src/view controllers/MessagesViewController.m b/Signal/src/view controllers/MessagesViewController.m
index 9bf9b7af2..4d0152c17 100644
--- a/Signal/src/view controllers/MessagesViewController.m	
+++ b/Signal/src/view controllers/MessagesViewController.m	
@@ -139,10 +139,9 @@ typedef enum : NSUInteger {
 
     if ([_thread isKindOfClass:[TSGroupThread class]] &&
         ![((TSGroupThread *)_thread).groupModel.groupMemberIds containsObject:[TSAccountManager localNumber]]) {
+
         [self inputToolbar].hidden = YES; // user has requested they leave the group. further sends disallowed
         self.navigationItem.rightBarButtonItem = nil; // further group action disallowed
-    } else if (![self isTextSecureReachable]) {
-        [self inputToolbar].hidden = YES; // only RedPhone
     } else {
         [self inputToolbar].hidden = NO;
         [self loadDraftInCompose];
diff --git a/Signal/src/view controllers/UITests/SignalsViewController.m b/Signal/src/view controllers/UITests/SignalsViewController.m
index ab9010048..e64ad52d0 100644
--- a/Signal/src/view controllers/UITests/SignalsViewController.m	
+++ b/Signal/src/view controllers/UITests/SignalsViewController.m	
@@ -324,10 +324,8 @@ static NSString *const kShowSignupFlowSegue = @"showSignupFlow";
 
 - (void)presentThread:(TSThread *)thread keyboardOnViewAppearing:(BOOL)keyboardOnViewAppearing {
     dispatch_async(dispatch_get_main_queue(), ^{
-      if (!_mvc) {
-          _mvc = [[UIStoryboard storyboardWithName:@"Storyboard" bundle:NULL]
-              instantiateViewControllerWithIdentifier:@"MessagesViewController"];
-      }
+      _mvc = [[UIStoryboard storyboardWithName:@"Storyboard" bundle:NULL]
+                instantiateViewControllerWithIdentifier:@"MessagesViewController"];
 
       if (self.presentedViewController) {
           [self.presentedViewController dismissViewControllerAnimated:YES completion:nil];