diff --git a/app/assets/javascripts/discourse/components/category-chooser.js.es6 b/app/assets/javascripts/discourse/components/category-chooser.js.es6
index 0450459d70c..4cef1f2edf1 100644
--- a/app/assets/javascripts/discourse/components/category-chooser.js.es6
+++ b/app/assets/javascripts/discourse/components/category-chooser.js.es6
@@ -21,7 +21,7 @@ export default ComboboxView.extend({
     return categories.filter(c => {
       if (scopedCategoryId && c.get('id') !== scopedCategoryId && c.get('parent_category_id') !== scopedCategoryId) { return false; }
       if (c.get('isUncategorizedCategory')) { return false; }
-      if (c.get('is_support')) { return false; }
+      if (c.get('contains_messages')) { return false; }
       return c.get('permission') === Discourse.PermissionType.FULL;
     });
   },
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index f69871ec3b9..435418ecf00 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -81,8 +81,8 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
   @computed("model.isPrivateMessage", "model.category_id")
   showCategoryChooser(isPrivateMessage, categoryId) {
     const category = Discourse.Category.findById(categoryId);
-    const isSupport = category && category.get("is_support");
-    return !isPrivateMessage && !isSupport;
+    const containsMessages = category && category.get("contains_messages");
+    return !isPrivateMessage && !containsMessages;
   },
 
   actions: {
diff --git a/app/assets/javascripts/discourse/models/category.js.es6 b/app/assets/javascripts/discourse/models/category.js.es6
index 74aee6c997a..492e36e58db 100644
--- a/app/assets/javascripts/discourse/models/category.js.es6
+++ b/app/assets/javascripts/discourse/models/category.js.es6
@@ -86,7 +86,7 @@ const Category = RestModel.extend({
         custom_fields: this.get('custom_fields'),
         topic_template: this.get('topic_template'),
         suppress_from_homepage: this.get('suppress_from_homepage'),
-        is_support: this.get("is_support"),
+        contains_messages: this.get("contains_messages"),
       },
       type: this.get('id') ? 'PUT' : 'POST'
     });
diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6
index 0ca96b49c6f..f0bc7eaca1f 100644
--- a/app/assets/javascripts/discourse/models/composer.js.es6
+++ b/app/assets/javascripts/discourse/models/composer.js.es6
@@ -71,8 +71,8 @@ const Composer = RestModel.extend({
   showCategoryChooser(isPrivateMessage, hasOptions, categoryId) {
     const manyCategories = Discourse.Category.list().length > 1;
     const category = Discourse.Category.findById(categoryId);
-    const isSupport = category && category.get("is_support");
-    return !isPrivateMessage && !isSupport && (hasOptions || manyCategories);
+    const containsMessages = category && category.get("contains_messages");
+    return !isPrivateMessage && !containsMessages && (hasOptions || manyCategories);
   },
 
   privateMessage: function(){
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
index 7020bbf81f4..1a7fa9b421a 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
@@ -22,8 +22,8 @@
 {{#if emailInEnabled}}
   <section class='field'>
     <label>
-      {{input type="checkbox" checked=category.is_support}}
-      {{i18n 'category.email_in_allow_strangers'}}
+      {{input type="checkbox" checked=category.contains_messages}}
+      {{i18n 'category.contains_messages'}}
     </label>
   </section>
   <section class='field'>
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index c1b7fa9465e..5e6a25f1b87 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -178,7 +178,7 @@ class CategoriesController < ApplicationController
                         :position,
                         :email_in,
                         :email_in_allow_strangers,
-                        :is_support,
+                        :contains_messages,
                         :suppress_from_homepage,
                         :parent_category_id,
                         :auto_close_hours,
diff --git a/app/models/topic.rb b/app/models/topic.rb
index f0933b0d4c4..03f415c9c1a 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -540,7 +540,7 @@ class Topic < ActiveRecord::Base
 
   def change_category_to_id(category_id)
     return false if private_message?
-    return false if category.try(:is_support)
+    return false if category.try(:contains_messages)
 
     new_category_id = category_id.to_i
     # if the category name is blank, reset the attribute
diff --git a/app/serializers/basic_category_serializer.rb b/app/serializers/basic_category_serializer.rb
index 7733203abeb..cf78bdfd865 100644
--- a/app/serializers/basic_category_serializer.rb
+++ b/app/serializers/basic_category_serializer.rb
@@ -20,7 +20,7 @@ class BasicCategorySerializer < ApplicationSerializer
              :can_edit,
              :topic_template,
              :has_children,
-             :is_support
+             :contains_messages
 
   def include_parent_category_id?
     parent_category_id
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 8b26361a108..0309d2a9c59 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1590,7 +1590,7 @@ en:
       email_in_allow_strangers: "Accept emails from anonymous users with no accounts"
       email_in_disabled: "Posting new topics via email is disabled in the Site Settings. To enable posting new topics via email, "
       email_in_disabled_click: 'enable the "email in" setting.'
-      is_support: "Transform this category into a private support portal."
+      contains_messages: "Change this category to only contain messages."
       suppress_from_homepage: "Suppress this category from the homepage."
       allow_badges_label: "Allow badges to be awarded in this category"
       edit_permissions: "Edit Permissions"
diff --git a/db/migrate/20151126173356_rename_is_support_to_contains_messages.rb b/db/migrate/20151126173356_rename_is_support_to_contains_messages.rb
new file mode 100644
index 00000000000..8d9cf8e4967
--- /dev/null
+++ b/db/migrate/20151126173356_rename_is_support_to_contains_messages.rb
@@ -0,0 +1,5 @@
+class RenameIsSupportToContainsMessages < ActiveRecord::Migration
+  def change
+    rename_column :categories, :is_support, :contains_messages
+  end
+end
diff --git a/spec/controllers/topics_controller_spec.rb b/spec/controllers/topics_controller_spec.rb
index 09cd717b93e..0566dc1ea8c 100644
--- a/spec/controllers/topics_controller_spec.rb
+++ b/spec/controllers/topics_controller_spec.rb
@@ -902,7 +902,7 @@ describe TopicsController do
           let(:another_category) { Fabricate(:category) }
 
           it "cannot change the category of a topic that is in a support category" do
-            @topic.category = Fabricate(:category, is_support: true)
+            @topic.category = Fabricate(:category, contains_messages: true)
             @topic.save!
             xhr :put, :update, topic_id: @topic.id, slug: @topic.title, category_id: another_category.id
             expect(response).not_to be_success