-$message = &$message->getEntity($passed_ent_id);
-
-$header = $message->header;
-$charset = $header->charset;
-$type0 = $header->type0;
-$type1 = $header->type1;
-$encoding = strtolower($header->encoding);
+if (!is_object($message)) {
+ $message = sqimap_get_message($imapConnection,$passed_id, $mailbox);
+}
+$subject = $message->rfc822_header->subject;
+if ($ent_id) {
+ $message = &$message->getEntity($ent_id);
+ $header = $message->header;
+
+ if ($message->rfc822_header) {
+ $subject = $message->rfc822_header->subject;
+ $charset = $header->content_type->properties['charset'];
+ } else {
+ $header = $message->header;
+ $charset = $header->getParameter('charset');
+ }
+ $type0 = $header->type0;
+ $type1 = $header->type1;
+ $encoding = strtolower($header->encoding);
+} else {
+ /* raw message */
+ $type0 = 'message';
+ $type1 = 'rfc822';
+ $encoding = "US-ASCII";
+}