diff --git a/src/translation/en.json b/src/translation/en.json
index 2ffe28540..c0bf7ba60 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -461,7 +461,9 @@
             "changeDomainProgress": "Changing Email domain:",
             "solrFts": "Full Text Search (Solr)",
             "solrEnabled": "Enabled",
-            "solrDisabled": "Disabled"
+            "solrDisabled": "Disabled",
+            "solrRunning": "Running",
+            "solrNotRunning": "Not Running"
         },
         "eventlog": {
             "title": "Event Log",
diff --git a/src/views/emails.html b/src/views/emails.html
index 8a54f1305..94a74a787 100644
--- a/src/views/emails.html
+++ b/src/views/emails.html
@@ -243,7 +243,11 @@
         <span class="text-muted">{{ 'emails.settings.solrFts' | tr }}</span>
       </div>
       <div class="col-xs-6 text-right">
-        <span ng-show="solrConfig.currentConfig.enabled">{{ 'emails.settings.solrEnabled' | tr }}</span>
+        <span ng-show="solrConfig.currentConfig.enabled">
+          {{ 'emails.settings.solrEnabled' | tr }}
+          <span ng-show="solrConfig.running">/ {{ 'emails.settings.solrRunning' | tr }}</span>
+          <span ng-hide="solrConfig.running">/ {{ 'emails.settings.solrNotRunning' | tr }}</span>
+        </span>
         <span ng-hide="solrConfig.currentConfig.enabled">{{ 'emails.settings.solrDisabled' | tr }}</span>
         <a href="" ng-click="solrConfig.show()"><i class="fa fa-edit text-small"></i></a>
       </div>
diff --git a/src/views/emails.js b/src/views/emails.js
index 8913ff286..734c9868d 100644
--- a/src/views/emails.js
+++ b/src/views/emails.js
@@ -218,13 +218,18 @@ angular.module('Application').controller('EmailsController', ['$scope', '$locati
         error: {},
         currentConfig: {},
         enabled: false,
+        running: false,
 
         refresh: function () {
-            Client.getSolrConfig(function (error, config) {
-                if (error) return console.error('Failed to get solr config', error);
+            Client.getService('mail', function (error, result) {
+                if (error) return console.log('Error getting status of mail conatiner', error);
 
+                Client.getSolrConfig(function (error, config) {
+                    if (error) return console.error('Failed to get solr config', error);
 
-                $scope.solrConfig.currentConfig = config;
+                    $scope.solrConfig.currentConfig = config;
+                    $scope.solrConfig.running = result.healthcheck && result.healthcheck.solr.status;
+                });
             });
         },