From 51854e56ac397644ae68fd6cd997ff08f56456ce Mon Sep 17 00:00:00 2001
From: Matt Palmer <mpalmer@hezmatt.org>
Date: Tue, 6 Sep 2016 14:23:18 +1000
Subject: [PATCH] Don't hide e-mail in settings behind email-in plugins

---
 app/assets/javascripts/admin/templates/group.hbs              | 3 +--
 .../discourse/templates/components/edit-category-settings.hbs | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/group.hbs b/app/assets/javascripts/admin/templates/group.hbs
index 39251a39e..1e7a90828 100644
--- a/app/assets/javascripts/admin/templates/group.hbs
+++ b/app/assets/javascripts/admin/templates/group.hbs
@@ -94,10 +94,9 @@
     </div>
 
     {{#if siteSettings.email_in}}
-      {{#plugin-outlet "group-email-in"}}
         <label for="incoming_email">{{i18n 'admin.groups.incoming_email'}}</label>
         {{text-field name="incoming_email" value=model.incoming_email placeholderKey="admin.groups.incoming_email_placeholder"}}
-      {{/plugin-outlet}}
+      {{plugin-outlet "group-email-in"}}
     {{/if}}
   {{/unless}}
 
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 cfe655315..1a9c68c6b 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
@@ -20,7 +20,6 @@
 </section>
 
 {{#if emailInEnabled}}
-  {{#plugin-outlet "category-email-in"}}
     <section class='field'>
       <label>
         {{input type="checkbox" checked=category.email_in_allow_strangers}}
@@ -35,7 +34,8 @@
         {{text-field class="email-in" value=category.email_in}}
       </label>
     </section>
-  {{/plugin-outlet}}
+
+  {{plugin-outlet "category-email-in"}}
 {{/if}}
 
 {{#if showPositionInput}}