diff --git a/js/views/new_conversation_view.js b/js/views/new_conversation_view.js
index 6d9bb8d33..0b9e201e9 100644
--- a/js/views/new_conversation_view.js
+++ b/js/views/new_conversation_view.js
@@ -125,7 +125,8 @@
                         type: 'group',
                         name: name,
                         avatar: avatarFile,
-                        members: members
+                        members: members,
+                        active_at: Date.now()
                     };
                     var group = new Whisper.Conversation(attributes);
                     group.save().then(function() {
@@ -160,6 +161,7 @@
 
         reset: function() {
             this.delegateEvents();
+            this.avatarInput.delegateEvents();
             this.$create.hide();
             this.$('.new-group-update-form .name').val('');
             this.$group_update.hide();
diff --git a/js/views/recipients_input_view.js b/js/views/recipients_input_view.js
index 47fbfbfd8..29caaf0a7 100644
--- a/js/views/recipients_input_view.js
+++ b/js/views/recipients_input_view.js
@@ -159,6 +159,9 @@
         },
 
         reset: function() {
+            this.delegateEvents();
+            this.typeahead_view.delegateEvents();
+            this.recipients_view.delegateEvents();
             this.typeahead.add(
                 this.recipients.filter(function(model) {
                     return !model.get('newContact');
diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index 90f483d85..15894ac2c 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -23,10 +23,6 @@
 }
 
 .key-verification {
-  .container {
-    height: 100%;
-    overflow: auto;
-  }
   p {
     padding: 1em;
   }
@@ -39,11 +35,6 @@
 .message-detail {
   background: $grey_l;
 
-  .container {
-    height: 100%;
-    overflow: auto;
-  }
-
   .message-container {
     background: white;
     padding: 1em 0;
@@ -93,7 +84,7 @@
 }
 
 .group-member-list,
-.new-group-update-form {
+.conversation + .new-group-update-form {
   height: 100%;
 
   .container {
diff --git a/stylesheets/_index.scss b/stylesheets/_index.scss
index a9c682b95..63ca09e4a 100644
--- a/stylesheets/_index.scss
+++ b/stylesheets/_index.scss
@@ -6,7 +6,8 @@
 .new-conversation, .inbox, .gutter {
   height: 100%;
 }
-.scrollable {
+
+.container, .scrollable {
   height: 100%;
   overflow: auto;
 }
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index c17317881..cbf2729cd 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -336,7 +336,7 @@ img.emoji {
 .new-conversation, .inbox, .gutter {
   height: 100%; }
 
-.scrollable {
+.container, .scrollable {
   height: 100%;
   overflow: auto; }
 
@@ -469,9 +469,6 @@ input.search {
 .conversation, .message-list, .message-detail, .key-verification {
   height: 100%; }
 
-.key-verification .container {
-  height: 100%;
-  overflow: auto; }
 .key-verification p {
   padding: 1em; }
 .key-verification .key {
@@ -480,9 +477,6 @@ input.search {
 
 .message-detail {
   background: #f3f3f3; }
-  .message-detail .container {
-    height: 100%;
-    overflow: auto; }
   .message-detail .message-container {
     background: white;
     padding: 1em 0; }
@@ -517,10 +511,10 @@ input.search {
   font-size: smaller; }
 
 .group-member-list,
-.new-group-update-form {
+.conversation + .new-group-update-form {
   height: 100%; }
   .group-member-list .container,
-  .new-group-update-form .container {
+  .conversation + .new-group-update-form .container {
     height: calc(100% - 36px); }
 
 .new-group-update-form .scrollable {