diff --git a/app/controllers/chat_channels_controller.rb b/app/controllers/chat_channels_controller.rb
index de97dff9e..98dd56a33 100644
--- a/app/controllers/chat_channels_controller.rb
+++ b/app/controllers/chat_channels_controller.rb
@@ -92,6 +92,7 @@ class ChatChannelsController < ApplicationController
       @chat_channels_memberships = current_user.
       chat_channel_memberships.includes(:chat_channel).
       where("has_unopened_messages = ? OR status = ?", true, "pending").
+      where(show_global_badge_notification: true).
       order("chat_channel_memberships.updated_at DESC")
     else
       @chat_channels_memberships = []
diff --git a/app/javascript/chat/compose.jsx b/app/javascript/chat/compose.jsx
index f96258696..1f0ec0c83 100644
--- a/app/javascript/chat/compose.jsx
+++ b/app/javascript/chat/compose.jsx
@@ -22,6 +22,7 @@ export default class Chat extends Component {
           id="messageform"
           placeholder="Message goes here"
           onKeyDown={handleKeyDown}
+          maxLength="1000"
         />
         <button
           className="messagecomposer__submit"
diff --git a/app/models/message.rb b/app/models/message.rb
index b7e980424..420a949a8 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -3,7 +3,7 @@ class Message < ApplicationRecord
   belongs_to :chat_channel
 
   validates :message_html, presence: true
-  validates :message_markdown, presence: true, length: { maximum: 600 }
+  validates :message_markdown, presence: true, length: { maximum: 1024 }
   validate :channel_permission
 
   before_save       :determine_user_validity
diff --git a/db/migrate/20180806142338_add_badge_notification_setting_to_chat_channel_memberships.rb b/db/migrate/20180806142338_add_badge_notification_setting_to_chat_channel_memberships.rb
new file mode 100644
index 000000000..348d2607d
--- /dev/null
+++ b/db/migrate/20180806142338_add_badge_notification_setting_to_chat_channel_memberships.rb
@@ -0,0 +1,5 @@
+class AddBadgeNotificationSettingToChatChannelMemberships < ActiveRecord::Migration[5.1]
+  def change
+    add_column :chat_channel_memberships, :show_global_badge_notification, :boolean, default: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d4869f2a3..08d00898b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180716182629) do
+ActiveRecord::Schema.define(version: 20180806142338) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -168,6 +168,7 @@ ActiveRecord::Schema.define(version: 20180716182629) do
     t.boolean "has_unopened_messages", default: false
     t.datetime "last_opened_at", default: "2017-01-01 05:00:00"
     t.string "role", default: "member"
+    t.boolean "show_global_badge_notification", default: true
     t.string "status", default: "active"
     t.datetime "updated_at", null: false
     t.bigint "user_id", null: false
@@ -377,6 +378,10 @@ ActiveRecord::Schema.define(version: 20180716182629) do
   create_table "messages", force: :cascade do |t|
     t.bigint "chat_channel_id", null: false
     t.datetime "created_at", null: false
+    t.text "encrypted_message_html"
+    t.text "encrypted_message_html_iv"
+    t.text "encrypted_message_markdown"
+    t.text "encrypted_message_markdown_iv"
     t.string "message_html", null: false
     t.string "message_markdown", null: false
     t.datetime "updated_at", null: false
diff --git a/spec/models/message_spec.rb b/spec/models/message_spec.rb
index e77ce7184..6632a2522 100644
--- a/spec/models/message_spec.rb
+++ b/spec/models/message_spec.rb
@@ -24,4 +24,13 @@ RSpec.describe Message, type: :model do
     message = build(:message, chat_channel_id: chat_channel.id, user_id: user_2.id)
     expect(message).to be_valid
   end
+
+  it "is invalid if over 1024 chars" do
+    long_text = Faker::Hipster.words(1500)
+    p long_text.size
+    message = build(:message, chat_channel_id: chat_channel.id, user_id: user.id, message_markdown: long_text)
+    expect(message).to_not be_valid
+    message.message_markdown = "hello"
+    expect(message).to be_valid
+  end
 end