diff --git a/modules/core/hm-mailbox.php b/modules/core/hm-mailbox.php
index eddcc6394..1e88cdf21 100644
--- a/modules/core/hm-mailbox.php
+++ b/modules/core/hm-mailbox.php
@@ -507,7 +507,11 @@ public function dump_cache($type = 'string') {
     }
 
     public function get_state() {
-        return $this->connection->get_state();
+        if ($this->is_imap()) {
+            return $this->connection->get_state();
+        } else {
+            return $this->authed() ? 'authenticated' : 'disconnected';
+        }
     }
 
     public function get_capability() {
diff --git a/modules/imap/output_modules.php b/modules/imap/output_modules.php
index 110f135e4..c72420fc6 100644
--- a/modules/imap/output_modules.php
+++ b/modules/imap/output_modules.php
@@ -729,7 +729,7 @@ class Hm_Output_display_imap_status extends Hm_Output_Module {
     protected function output() {
         $res = '';
         foreach ($this->get('imap_servers', array()) as $index => $vals) {
-            $res .= '<tr><td>IMAP</td><td>'.$vals['name'].'</td><td class="imap_status_'.$vals['id'].'"></td>'.
+            $res .= '<tr><td>'.(strtoupper($vals['type'] ?? 'IMAP')).'</td><td>'.$vals['name'].'</td><td class="imap_status_'.$vals['id'].'"></td>'.
                 '<td class="imap_detail_'.$vals['id'].'"></td></tr>';
         }
         return $res;