diff --git a/src/PhpImap/Mailbox.php b/src/PhpImap/Mailbox.php
index f8c2ce39..69cdb477 100644
--- a/src/PhpImap/Mailbox.php
+++ b/src/PhpImap/Mailbox.php
@@ -591,16 +591,16 @@ public function getMailsInfo(array $mailsIds) {
 		$mails = $this->imap('fetch_overview', [implode(',', $mailsIds), ($this->imapSearchOption == SE_UID) ? FT_UID : 0]);
 		if(is_array($mails) && count($mails)) {
 			foreach($mails as &$mail) {
-				if(isset($mail->subject) && !empty($mail->subject)) {
+				if(isset($mail->subject)) {
 					$mail->subject = $this->decodeMimeStr($mail->subject, $this->getServerEncoding());
 				}
-				if(isset($mail->from) AND !empty($mail->from)) {
+				if(isset($mail->from) AND !empty($head->from)) {
 					$mail->from = $this->decodeMimeStr($mail->from, $this->getServerEncoding());
 				}
-				if(isset($mail->sender) AND !empty($mail->sender)) {
+				if(isset($mail->sender) AND !empty($head->sender)) {
 					$mail->sender = $this->decodeMimeStr($mail->sender, $this->getServerEncoding());
 				}
-				if(isset($mail->to) && !empty($mail->to)) {
+				if(isset($mail->to)) {
 					$mail->to = $this->decodeMimeStr($mail->to, $this->getServerEncoding());
 				}
 			}