Sanity checking

diff --git a/imp/message.php b/imp/message.php
index dba6e69..9afac40 100644 (file)
--- a/imp/message.php
+++ b/imp/message.php
@@ -227,6 +227,11 @@ try {
         Horde_Imap_Client::FETCH_HEADERTEXT => array(array('parse' => true, 'peek' => $peek))
     ), array('ids' => array($uid)));
 } catch (Horde_Imap_Client_Exception $e) {
+    $fetch_ret = null;
+}
+
+if (is_null($fetch_ret) || !isset($fetch_ret[$uid]['headertext'])) {
+    _returnToMailbox(null, 'message_missing');
     require IMP_BASE . '/mailbox.php';
     exit;
 }