- $rfc822_header->subject = _("Read:") . ' ' . decodeHeader($header->subject);
-
-
- $reply_to = '';
- if (isset($identity) && $identity != 'default') {
- $from_mail = getPref($data_dir, $username,
- 'email_address' . $identity);
- $full_name = getPref($data_dir, $username,
- 'full_name' . $identity);
- $from_addr = '"'.$full_name.'" <'.$from_mail.'>';
- $reply_to = getPref($data_dir, $username,
- 'reply_to' . $identity);
+ $rfc822_header->subject = _("Read:") . ' ' . encodeHeader($header->subject);
+
+ // Patch #793504 Return Receipt Failing with <@> from Tim Craig (burny_md)
+ // This merely comes from compose.php and only happens when there is no
+ // email_addr specified in user's identity (which is the startup config)
+ if (ereg("^([^@%/]+)[@%/](.+)$", $username, $usernamedata)) {
+ $popuser = $usernamedata[1];
+ $domain = $usernamedata[2];
+ unset($usernamedata);