diff --git a/application/Espo/Core/Mail/Importer.php b/application/Espo/Core/Mail/Importer.php
index a6ae800231..c8aa318ff2 100644
--- a/application/Espo/Core/Mail/Importer.php
+++ b/application/Espo/Core/Mail/Importer.php
@@ -31,8 +31,13 @@ class Importer
 		try {
 			$email = $this->getEntityManager()->getEntity('Email');
 			
+			$subject = $message->subject;
+			if ($subject !== '0' && empty($subject)) {
+				$subject = '--empty--';
+			}
+			
 			$email->set('isHtml', false);		
-			$email->set('name', $message->subject);
+			$email->set('name', $subject);
 			$email->set('status', 'Archived');
 			$email->set('attachmentsIds', array());			
 			$email->set('assignedUserId', $userId);