diff --git a/app/assets/javascripts/admin/controllers/admin-email-incomings.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-incomings.js.es6
index deb7f0771c6..a6acd9af78f 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-incomings.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-incomings.js.es6
@@ -1,11 +1,21 @@
 import IncomingEmail from 'admin/models/incoming-email';
 
 export default Ember.Controller.extend({
-  loadMore() {
-    return IncomingEmail.findAll(this.get("filter"), this.get("model.length"))
-                   .then(incoming => {
-                      if (incoming.length < 50) { this.get("model").set("allLoaded", true); }
-                      this.get("model").addObjects(incoming);
-                   });
+  loading: false,
+
+  actions: {
+
+    loadMore() {
+      if (this.get("loading") || this.get("model.allLoaded")) { return; }
+      this.set('loading', true);
+
+      IncomingEmail.findAll(this.get("filter"), this.get("model.length"))
+                     .then(incoming => {
+                        if (incoming.length < 50) { this.get("model").set("allLoaded", true); }
+                        this.get("model").addObjects(incoming);
+                     }).finally(() => {
+                       this.set('loading', false);
+                     });
+    }
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-email-logs.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-logs.js.es6
index 2506a0cd999..44a38dfa324 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-logs.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-logs.js.es6
@@ -1,11 +1,20 @@
 import EmailLog from 'admin/models/email-log';
 
 export default Ember.Controller.extend({
-  loadMore() {
-    return EmailLog.findAll(this.get("filter"), this.get("model.length"))
-                   .then(logs => {
-                      if (logs.length < 50) { this.get("model").set("allLoaded", true); }
-                      this.get("model").addObjects(logs);
-                   });
+  loading: false,
+
+  actions: {
+    loadMore() {
+      if (this.get("loading") || this.get("model.allLoaded")) { return; }
+
+      this.set('loading', true);
+      return EmailLog.findAll(this.get("filter"), this.get("model.length"))
+                     .then(logs => {
+                        if (logs.length < 50) { this.get("model").set("allLoaded", true); }
+                        this.get("model").addObjects(logs);
+                     }).finally(() => {
+                       this.set('loading', false);
+                     });
+    }
   }
 });
diff --git a/app/assets/javascripts/admin/templates/email-received.hbs b/app/assets/javascripts/admin/templates/email-received.hbs
index 95e0cb2dc57..e6e3bcbec96 100644
--- a/app/assets/javascripts/admin/templates/email-received.hbs
+++ b/app/assets/javascripts/admin/templates/email-received.hbs
@@ -1,55 +1,57 @@
-<table class='table email-list'>
-  <thead>
-    <tr>
-      <th>{{i18n 'admin.email.time'}}</th>
-      <th>{{i18n 'admin.email.incoming_emails.from_address'}}</th>
-      <th>{{i18n 'admin.email.incoming_emails.to_addresses'}}</th>
-      <th>{{i18n 'admin.email.incoming_emails.subject'}}</th>
+{{#load-more selector=".email-list tr" action="loadMore"}}
+  <table class='table email-list'>
+    <thead>
+      <tr>
+        <th>{{i18n 'admin.email.time'}}</th>
+        <th>{{i18n 'admin.email.incoming_emails.from_address'}}</th>
+        <th>{{i18n 'admin.email.incoming_emails.to_addresses'}}</th>
+        <th>{{i18n 'admin.email.incoming_emails.subject'}}</th>
+      </tr>
+    </thead>
+
+    <tr class="filters">
+      <td>{{i18n 'admin.email.logs.filters.title'}}</td>
+      <td>{{text-field value=filter.from placeholderKey="admin.email.incoming_emails.filters.from_placeholder"}}</td>
+      <td>{{text-field value=filter.to placeholderKey="admin.email.incoming_emails.filters.to_placeholder"}}</td>
+      <td>{{text-field value=filter.subject placeholderKey="admin.email.incoming_emails.filters.subject_placeholder"}}</td>
     </tr>
-  </thead>
 
-  <tr class="filters">
-    <td>{{i18n 'admin.email.logs.filters.title'}}</td>
-    <td>{{text-field value=filter.from placeholderKey="admin.email.incoming_emails.filters.from_placeholder"}}</td>
-    <td>{{text-field value=filter.to placeholderKey="admin.email.incoming_emails.filters.to_placeholder"}}</td>
-    <td>{{text-field value=filter.subject placeholderKey="admin.email.incoming_emails.filters.subject_placeholder"}}</td>
-  </tr>
-
-  {{#each email in model}}
-    <tr>
-      <td class="time">{{format-date email.created_at}}</td>
-      <td class="username">
-        <div>
-          {{#if email.user}}
-            {{#link-to 'adminUser' email.user}}
-              {{avatar email.user imageSize="tiny"}}
-              {{email.from_address}}
-            {{/link-to}}
+    {{#each email in model}}
+      <tr>
+        <td class="time">{{format-date email.created_at}}</td>
+        <td class="username">
+          <div>
+            {{#if email.user}}
+              {{#link-to 'adminUser' email.user}}
+                {{avatar email.user imageSize="tiny"}}
+                {{email.from_address}}
+              {{/link-to}}
+            {{else}}
+              &mdash;
+            {{/if}}
+          </div>
+        </td>
+        <td class="addresses">
+          {{#each to in email.to_addresses}}
+            <p><a href="mailto:{{unbound to}}" title="TO">{{unbound to}}</a></p>
+          {{/each}}
+          {{#each cc in email.cc_addresses}}
+            <p><a href="mailto:{{unbound cc}}" title="CC">{{unbound cc}}</a></p>
+          {{/each}}
+        </td>
+        <td>
+          {{#if email.post_url}}
+            <a href="{{email.post_url}}">{{email.subject}}</a>
           {{else}}
-            &mdash;
+            {{email.subject}}
           {{/if}}
-        </div>
-      </td>
-      <td class="addresses">
-        {{#each to in email.to_addresses}}
-          <p><a href="mailto:{{unbound to}}" title="TO">{{unbound to}}</a></p>
-        {{/each}}
-        {{#each cc in email.cc_addresses}}
-          <p><a href="mailto:{{unbound cc}}" title="CC">{{unbound cc}}</a></p>
-        {{/each}}
-      </td>
-      <td>
-        {{#if email.post_url}}
-          <a href="{{email.post_url}}">{{email.subject}}</a>
-        {{else}}
-          {{email.subject}}
-        {{/if}}
-      </td>
-    </tr>
-  {{else}}
-    <tr><td colspan="4">{{i18n 'admin.email.incoming_emails.none'}}</td></tr>
-  {{/each}}
+        </td>
+      </tr>
+    {{else}}
+      <tr><td colspan="4">{{i18n 'admin.email.incoming_emails.none'}}</td></tr>
+    {{/each}}
 
-</table>
+  </table>
+{{/load-more}}
 
-{{conditional-loading-spinner condition=view.loading}}
+{{conditional-loading-spinner condition=loading}}
diff --git a/app/assets/javascripts/admin/templates/email-rejected.hbs b/app/assets/javascripts/admin/templates/email-rejected.hbs
index 3c5f3cba8eb..664eb728669 100644
--- a/app/assets/javascripts/admin/templates/email-rejected.hbs
+++ b/app/assets/javascripts/admin/templates/email-rejected.hbs
@@ -1,54 +1,56 @@
-<table class='table email-list'>
-  <thead>
-    <tr>
-      <th>{{i18n 'admin.email.time'}}</th>
-      <th>{{i18n 'admin.email.incoming_emails.from_address'}}</th>
-      <th>{{i18n 'admin.email.incoming_emails.to_addresses'}}</th>
-      <th>{{i18n 'admin.email.incoming_emails.subject'}}</th>
-      <th>{{i18n 'admin.email.incoming_emails.error'}}</th>
+{{#load-more selector=".email-list tr" action="loadMore"}}
+  <table class='table email-list'>
+    <thead>
+      <tr>
+        <th>{{i18n 'admin.email.time'}}</th>
+        <th>{{i18n 'admin.email.incoming_emails.from_address'}}</th>
+        <th>{{i18n 'admin.email.incoming_emails.to_addresses'}}</th>
+        <th>{{i18n 'admin.email.incoming_emails.subject'}}</th>
+        <th>{{i18n 'admin.email.incoming_emails.error'}}</th>
+      </tr>
+    </thead>
+
+    <tr class="filters">
+      <td>{{i18n 'admin.email.logs.filters.title'}}</td>
+      <td>{{text-field value=filter.from placeholderKey="admin.email.incoming_emails.filters.from_placeholder"}}</td>
+      <td>{{text-field value=filter.to placeholderKey="admin.email.incoming_emails.filters.to_placeholder"}}</td>
+      <td>{{text-field value=filter.subject placeholderKey="admin.email.incoming_emails.filters.subject_placeholder"}}</td>
+      <td>{{text-field value=filter.error placeholderKey="admin.email.incoming_emails.filters.error_placeholder"}}</td>
     </tr>
-  </thead>
 
-  <tr class="filters">
-    <td>{{i18n 'admin.email.logs.filters.title'}}</td>
-    <td>{{text-field value=filter.from placeholderKey="admin.email.incoming_emails.filters.from_placeholder"}}</td>
-    <td>{{text-field value=filter.to placeholderKey="admin.email.incoming_emails.filters.to_placeholder"}}</td>
-    <td>{{text-field value=filter.subject placeholderKey="admin.email.incoming_emails.filters.subject_placeholder"}}</td>
-    <td>{{text-field value=filter.error placeholderKey="admin.email.incoming_emails.filters.error_placeholder"}}</td>
-  </tr>
+    {{#each email in model}}
+      <tr>
+        <td class="time">{{format-date email.created_at}}</td>
+        <td class="username">
+          <div>
+            {{#if email.user}}
+              {{#link-to 'adminUser' email.user}}
+                {{avatar email.user imageSize="tiny"}}
+                {{email.from_address}}
+              {{/link-to}}
+            {{else}}
+              &mdash;
+            {{/if}}
+          </div>
+        </td>
+        <td class="addresses">
+          {{#each to in email.to_addresses}}
+            <p><a href="mailto:{{unbound to}}" title="TO">{{unbound to}}</a></p>
+          {{/each}}
+          {{#each cc in email.cc_addresses}}
+            <p><a href="mailto:{{unbound cc}}" title="CC">{{unbound cc}}</a></p>
+          {{/each}}
+        </td>
+        <td>{{email.subject}}</td>
+        <td class="error">
+          <a {{action "showIncomingEmail" email.id}}>{{email.error}}</a>
+        </td>
+      </tr>
+    {{else}}
+      <tr><td colspan="5">{{i18n 'admin.email.incoming_emails.none'}}</td></tr>
+    {{/each}}
 
-  {{#each email in model}}
-    <tr>
-      <td class="time">{{format-date email.created_at}}</td>
-      <td class="username">
-        <div>
-          {{#if email.user}}
-            {{#link-to 'adminUser' email.user}}
-              {{avatar email.user imageSize="tiny"}}
-              {{email.from_address}}
-            {{/link-to}}
-          {{else}}
-            &mdash;
-          {{/if}}
-        </div>
-      </td>
-      <td class="addresses">
-        {{#each to in email.to_addresses}}
-          <p><a href="mailto:{{unbound to}}" title="TO">{{unbound to}}</a></p>
-        {{/each}}
-        {{#each cc in email.cc_addresses}}
-          <p><a href="mailto:{{unbound cc}}" title="CC">{{unbound cc}}</a></p>
-        {{/each}}
-      </td>
-      <td>{{email.subject}}</td>
-      <td class="error">
-        <a {{action "showIncomingEmail" email.id}}>{{email.error}}</a>
-      </td>
-    </tr>
-  {{else}}
-    <tr><td colspan="5">{{i18n 'admin.email.incoming_emails.none'}}</td></tr>
-  {{/each}}
+  </table>
+{{/load-more}}
 
-</table>
-
-{{conditional-loading-spinner condition=view.loading}}
+{{conditional-loading-spinner condition=loading}}
diff --git a/app/assets/javascripts/admin/templates/email-sent.hbs b/app/assets/javascripts/admin/templates/email-sent.hbs
index 2f8785c6f59..ca5fb4aaa2a 100644
--- a/app/assets/javascripts/admin/templates/email-sent.hbs
+++ b/app/assets/javascripts/admin/templates/email-sent.hbs
@@ -1,47 +1,49 @@
-<table class='table email-list'>
-  <thead>
-    <tr>
-      <th>{{i18n 'admin.email.sent_at'}}</th>
-      <th>{{i18n 'admin.email.user'}}</th>
-      <th>{{i18n 'admin.email.to_address'}}</th>
-      <th>{{i18n 'admin.email.email_type'}}</th>
-      <th>{{i18n 'admin.email.reply_key'}}</th>
+{{#load-more selector=".email-list tr" action="loadMore"}}
+  <table class='table email-list'>
+    <thead>
+      <tr>
+        <th>{{i18n 'admin.email.sent_at'}}</th>
+        <th>{{i18n 'admin.email.user'}}</th>
+        <th>{{i18n 'admin.email.to_address'}}</th>
+        <th>{{i18n 'admin.email.email_type'}}</th>
+        <th>{{i18n 'admin.email.reply_key'}}</th>
+      </tr>
+    </thead>
+
+    <tr class="filters">
+      <td>{{i18n 'admin.email.logs.filters.title'}}</td>
+      <td>{{text-field value=filter.user placeholderKey="admin.email.logs.filters.user_placeholder"}}</td>
+      <td>{{text-field value=filter.address placeholderKey="admin.email.logs.filters.address_placeholder"}}</td>
+      <td>{{text-field value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td>
+      <td>{{text-field value=filter.reply_key placeholderKey="admin.email.logs.filters.reply_key_placeholder"}}</td>
     </tr>
-  </thead>
 
-  <tr class="filters">
-    <td>{{i18n 'admin.email.logs.filters.title'}}</td>
-    <td>{{text-field value=filter.user placeholderKey="admin.email.logs.filters.user_placeholder"}}</td>
-    <td>{{text-field value=filter.address placeholderKey="admin.email.logs.filters.address_placeholder"}}</td>
-    <td>{{text-field value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td>
-    <td>{{text-field value=filter.reply_key placeholderKey="admin.email.logs.filters.reply_key_placeholder"}}</td>
-  </tr>
+    {{#each l in model}}
+      <tr>
+        <td>{{format-date l.created_at}}</td>
+        <td>
+          {{#if l.user}}
+            {{#link-to 'adminUser' l.user}}{{avatar l.user imageSize="tiny"}}{{/link-to}}
+            {{#link-to 'adminUser' l.user}}{{l.user.username}}{{/link-to}}
+          {{else}}
+            &mdash;
+          {{/if}}
+        </td>
+        <td><a href='mailto:{{unbound l.to_address}}'>{{l.to_address}}</a></td>
+        <td>{{l.email_type}}</td>
+        <td>
+          {{#if l.post_url}}
+            <a href="{{l.post_url}}">{{l.reply_key}}</a>
+          {{else}}
+            {{l.reply_key}}
+          {{/if}}
+        </td>
+      </tr>
+    {{else}}
+      <tr><td colspan="5">{{i18n 'admin.email.logs.none'}}</td></tr>
+    {{/each}}
 
-  {{#each l in model}}
-    <tr>
-      <td>{{format-date l.created_at}}</td>
-      <td>
-        {{#if l.user}}
-          {{#link-to 'adminUser' l.user}}{{avatar l.user imageSize="tiny"}}{{/link-to}}
-          {{#link-to 'adminUser' l.user}}{{l.user.username}}{{/link-to}}
-        {{else}}
-          &mdash;
-        {{/if}}
-      </td>
-      <td><a href='mailto:{{unbound l.to_address}}'>{{l.to_address}}</a></td>
-      <td>{{l.email_type}}</td>
-      <td>
-        {{#if l.post_url}}
-          <a href="{{l.post_url}}">{{l.reply_key}}</a>
-        {{else}}
-          {{l.reply_key}}
-        {{/if}}
-      </td>
-    </tr>
-  {{else}}
-    <tr><td colspan="5">{{i18n 'admin.email.logs.none'}}</td></tr>
-  {{/each}}
+  </table>
+{{/load-more}}
 
-</table>
-
-{{conditional-loading-spinner condition=view.loading}}
+{{conditional-loading-spinner condition=loading}}
diff --git a/app/assets/javascripts/admin/templates/email-skipped.hbs b/app/assets/javascripts/admin/templates/email-skipped.hbs
index 6ef48725668..9c21c428cd9 100644
--- a/app/assets/javascripts/admin/templates/email-skipped.hbs
+++ b/app/assets/javascripts/admin/templates/email-skipped.hbs
@@ -1,47 +1,49 @@
-<table class='table email-list'>
-  <thead>
-    <tr>
-      <th>{{i18n 'admin.email.time'}}</th>
-      <th>{{i18n 'admin.email.user'}}</th>
-      <th>{{i18n 'admin.email.to_address'}}</th>
-      <th>{{i18n 'admin.email.email_type'}}</th>
-      <th>{{i18n 'admin.email.skipped_reason'}}</th>
+{{#load-more selector=".email-list tr" action="loadMore"}}
+  <table class='table email-list'>
+    <thead>
+      <tr>
+        <th>{{i18n 'admin.email.time'}}</th>
+        <th>{{i18n 'admin.email.user'}}</th>
+        <th>{{i18n 'admin.email.to_address'}}</th>
+        <th>{{i18n 'admin.email.email_type'}}</th>
+        <th>{{i18n 'admin.email.skipped_reason'}}</th>
+      </tr>
+    </thead>
+
+    <tr class="filters">
+      <td>{{i18n 'admin.email.logs.filters.title'}}</td>
+      <td>{{text-field value=filter.user placeholderKey="admin.email.logs.filters.user_placeholder"}}</td>
+      <td>{{text-field value=filter.address placeholderKey="admin.email.logs.filters.address_placeholder"}}</td>
+      <td>{{text-field value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td>
+      <td>{{text-field value=filter.skipped_reason placeholderKey="admin.email.logs.filters.skipped_reason_placeholder"}}</td>
     </tr>
-  </thead>
 
-  <tr class="filters">
-    <td>{{i18n 'admin.email.logs.filters.title'}}</td>
-    <td>{{text-field value=filter.user placeholderKey="admin.email.logs.filters.user_placeholder"}}</td>
-    <td>{{text-field value=filter.address placeholderKey="admin.email.logs.filters.address_placeholder"}}</td>
-    <td>{{text-field value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td>
-    <td>{{text-field value=filter.skipped_reason placeholderKey="admin.email.logs.filters.skipped_reason_placeholder"}}</td>
-  </tr>
+    {{#each l in model}}
+      <tr>
+        <td>{{format-date l.created_at}}</td>
+        <td>
+          {{#if l.user}}
+            {{#link-to 'adminUser' l.user}}{{avatar l.user imageSize="tiny"}}{{/link-to}}
+            {{#link-to 'adminUser' l.user}}{{l.user.username}}{{/link-to}}
+          {{else}}
+            &mdash;
+          {{/if}}
+        </td>
+        <td><a href='mailto:{{unbound l.to_address}}'>{{l.to_address}}</a></td>
+        <td>{{l.email_type}}</td>
+        <td>
+          {{#if l.post_url}}
+            <a href="{{l.post_url}}">{{l.skipped_reason}}</a>
+          {{else}}
+            {{l.skipped_reason}}
+          {{/if}}
+        </td>
+      </tr>
+    {{else}}
+      <tr><td colspan="5">{{i18n 'admin.email.logs.none'}}</td></tr>
+    {{/each}}
 
-  {{#each l in model}}
-    <tr>
-      <td>{{format-date l.created_at}}</td>
-      <td>
-        {{#if l.user}}
-          {{#link-to 'adminUser' l.user}}{{avatar l.user imageSize="tiny"}}{{/link-to}}
-          {{#link-to 'adminUser' l.user}}{{l.user.username}}{{/link-to}}
-        {{else}}
-          &mdash;
-        {{/if}}
-      </td>
-      <td><a href='mailto:{{unbound l.to_address}}'>{{l.to_address}}</a></td>
-      <td>{{l.email_type}}</td>
-      <td>
-        {{#if l.post_url}}
-          <a href="{{l.post_url}}">{{l.skipped_reason}}</a>
-        {{else}}
-          {{l.skipped_reason}}
-        {{/if}}
-      </td>
-    </tr>
-  {{else}}
-    <tr><td colspan="5">{{i18n 'admin.email.logs.none'}}</td></tr>
-  {{/each}}
+  </table>
+{{/load-more}}
 
-</table>
-
-{{conditional-loading-spinner condition=view.loading}}
+{{conditional-loading-spinner condition=loading}}
diff --git a/app/assets/javascripts/admin/views/admin-email-incomings.js.es6 b/app/assets/javascripts/admin/views/admin-email-incomings.js.es6
deleted file mode 100644
index 6360f857b71..00000000000
--- a/app/assets/javascripts/admin/views/admin-email-incomings.js.es6
+++ /dev/null
@@ -1,14 +0,0 @@
-import LoadMore from "discourse/mixins/load-more";
-
-export default Ember.View.extend(LoadMore, {
-  loading: false,
-  eyelineSelector: ".email-list tr",
-
-  actions: {
-    loadMore() {
-      if (this.get("loading") || this.get("model.allLoaded")) { return; }
-      this.set("loading", true);
-      return this.get("controller").loadMore().then(() => this.set("loading", false));
-    }
-  }
-});
diff --git a/app/assets/javascripts/admin/views/admin-email-logs.js.es6 b/app/assets/javascripts/admin/views/admin-email-logs.js.es6
deleted file mode 100644
index 6360f857b71..00000000000
--- a/app/assets/javascripts/admin/views/admin-email-logs.js.es6
+++ /dev/null
@@ -1,14 +0,0 @@
-import LoadMore from "discourse/mixins/load-more";
-
-export default Ember.View.extend(LoadMore, {
-  loading: false,
-  eyelineSelector: ".email-list tr",
-
-  actions: {
-    loadMore() {
-      if (this.get("loading") || this.get("model.allLoaded")) { return; }
-      this.set("loading", true);
-      return this.get("controller").loadMore().then(() => this.set("loading", false));
-    }
-  }
-});
diff --git a/app/assets/javascripts/admin/views/admin-email-received.js.es6 b/app/assets/javascripts/admin/views/admin-email-received.js.es6
deleted file mode 100644
index da0d8de157c..00000000000
--- a/app/assets/javascripts/admin/views/admin-email-received.js.es6
+++ /dev/null
@@ -1,5 +0,0 @@
-import AdminEmailIncomingsView from "admin/views/admin-email-incomings";
-
-export default AdminEmailIncomingsView.extend({
-  templateName: "admin/templates/email-received"
-});
diff --git a/app/assets/javascripts/admin/views/admin-email-rejected.js.es6 b/app/assets/javascripts/admin/views/admin-email-rejected.js.es6
deleted file mode 100644
index b89fe8d46a0..00000000000
--- a/app/assets/javascripts/admin/views/admin-email-rejected.js.es6
+++ /dev/null
@@ -1,5 +0,0 @@
-import AdminEmailIncomingsView from "admin/views/admin-email-incomings";
-
-export default AdminEmailIncomingsView.extend({
-  templateName: "admin/templates/email-rejected"
-});
diff --git a/app/assets/javascripts/admin/views/admin-email-sent.js.es6 b/app/assets/javascripts/admin/views/admin-email-sent.js.es6
deleted file mode 100644
index d007a79644f..00000000000
--- a/app/assets/javascripts/admin/views/admin-email-sent.js.es6
+++ /dev/null
@@ -1,5 +0,0 @@
-import AdminEmailLogsView from "admin/views/admin-email-logs";
-
-export default AdminEmailLogsView.extend({
-  templateName: "admin/templates/email-sent"
-});
diff --git a/app/assets/javascripts/admin/views/admin-email-skipped.js.es6 b/app/assets/javascripts/admin/views/admin-email-skipped.js.es6
deleted file mode 100644
index e3c44670992..00000000000
--- a/app/assets/javascripts/admin/views/admin-email-skipped.js.es6
+++ /dev/null
@@ -1,5 +0,0 @@
-import AdminEmailLogsView from "admin/views/admin-email-logs";
-
-export default AdminEmailLogsView.extend({
-  templateName: "admin/templates/email-skipped"
-});
diff --git a/app/assets/javascripts/discourse/components/check-mark.js.es6 b/app/assets/javascripts/discourse/components/check-mark.js.es6
new file mode 100644
index 00000000000..702af6a15a4
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/check-mark.js.es6
@@ -0,0 +1,11 @@
+import computed from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Component.extend({
+  tagName: 'i',
+  classNameBindings: [':fa', 'iconClass'],
+
+  @computed('checked')
+  iconClass(checked) {
+    return checked ? 'fa-check' : 'fa-times';
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/load-more.js.es6 b/app/assets/javascripts/discourse/components/load-more.js.es6
new file mode 100644
index 00000000000..4b355a5b0aa
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/load-more.js.es6
@@ -0,0 +1,16 @@
+import LoadMore from "discourse/mixins/load-more";
+
+export default Ember.Component.extend(LoadMore, {
+  _viaComponent: true,
+
+  init() {
+    this._super();
+    this.set('eyelineSelector', this.get('selector'));
+  },
+
+  actions: {
+    loadMore() {
+      this.sendAction();
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/mixins/load-more.js.es6 b/app/assets/javascripts/discourse/mixins/load-more.js.es6
index c422e1cd633..16c8734054d 100644
--- a/app/assets/javascripts/discourse/mixins/load-more.js.es6
+++ b/app/assets/javascripts/discourse/mixins/load-more.js.es6
@@ -5,6 +5,14 @@ import { on } from 'ember-addons/ember-computed-decorators';
 // Provides the ability to load more items for a view which is scrolled to the bottom.
 export default Ember.Mixin.create(Ember.ViewTargetActionSupport, Scrolling, {
 
+  init() {
+    this._super();
+    if (!this._viaComponent) {
+      console.warn('Using `LoadMore` as a view mixin is deprecated. Use `{{load-more}}` instead');
+    }
+
+  },
+
   scrolled() {
     const eyeline = this.get('eyeline');
     return eyeline && eyeline.update();
diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/templates/badges/show.hbs
index 7f15cc73e13..f762e6dfe62 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/show.hbs
@@ -14,21 +14,25 @@
   <div class='badges-listing'>
     <div class='row'>
       <div class='grant-count'>{{i18n 'badges.granted' count=grantCount}}</div>
-      <div class='info'>{{i18n 'badges.allow_title'}} {{{view.allowTitle}}}<br>{{i18n 'badges.multiple_grant'}} {{{view.multipleGrant}}}
+      <div class='info'>
+        {{i18n 'badges.allow_title'}} {{check-mark checked=model.allow_title}}<br>
+        {{i18n 'badges.multiple_grant'}} {{check-mark checked=model.multiple_grant}}
       </div>
     </div>
   </div>
 
   {{#if userBadges}}
     <div class="user-badges">
-      {{#each userBadges as |ub|}}
-        {{#user-info user=ub.user size="medium" class="badge-info" date=ub.granted_at}}
-          <div class="granted-on">{{i18n 'badges.granted_on' date=(inline-date ub.granted_at)}}</div>
-          {{#if ub.post_number}}
-            <a class="post-link" href="{{unbound ub.topic.url}}/{{unbound ub.post_number}}">{{{ub.topic.fancyTitle}}}</a>
-          {{/if}}
-        {{/user-info}}
-      {{/each}}
+      {{#load-more selector=".badge-info" action="loadMore"}}
+        {{#each userBadges as |ub|}}
+          {{#user-info user=ub.user size="medium" class="badge-info" date=ub.granted_at}}
+            <div class="granted-on">{{i18n 'badges.granted_on' date=(inline-date ub.granted_at)}}</div>
+            {{#if ub.post_number}}
+              <a class="post-link" href="{{unbound ub.topic.url}}/{{unbound ub.post_number}}">{{{ub.topic.fancyTitle}}}</a>
+            {{/if}}
+          {{/user-info}}
+        {{/each}}
+      {{/load-more}}
 
       {{#unless canLoadMore}}
         {{#if user}}
diff --git a/app/assets/javascripts/discourse/views/badges-show.js.es6 b/app/assets/javascripts/discourse/views/badges-show.js.es6
deleted file mode 100644
index 2aae5f7675a..00000000000
--- a/app/assets/javascripts/discourse/views/badges-show.js.es6
+++ /dev/null
@@ -1,11 +0,0 @@
-import LoadMore from "discourse/mixins/load-more";
-
-export default Ember.View.extend(LoadMore, {
-  eyelineSelector: '.badge-info',
-  tickOrX: function(field){
-    var icon = this.get('controller.model.' + field) ? "fa-check" : "fa-times";
-    return "<i class='fa " + icon + "'></i>";
-  },
-  allowTitle: function() { return this.tickOrX("allow_title"); }.property(),
-  multipleGrant: function() { return this.tickOrX("multiple_grant"); }.property()
-});