diff --git a/plugins/identity_select/identity_select.php b/plugins/identity_select/identity_select.php
index e0c37232f..5020ff991 100644
--- a/plugins/identity_select/identity_select.php
+++ b/plugins/identity_select/identity_select.php
@@ -49,7 +49,7 @@ class identity_select extends rcube_plugin
      */
     function select($p)
     {
-        if ($p['selected'] !== null || !is_object($p['message']->headers)) {
+        if ($p['selected'] !== null || empty($p['message']->headers)) {
             return $p;
         }