-$message = &$message->getEntity($ent_id);
-$header = $message->header;
-if ($message->rfc822_header) {
- $subject = $message->rfc822_header->subject;
- $charset = $header->content_type->properties['charset'];
+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);