diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php b/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
index dd8c34ea8..1cbbddc8d 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
@@ -173,6 +173,8 @@ class MailClient
 //			\MailSo\Mime\Enumerations\Header::CONTENT_TYPE,
 //			\MailSo\Mime\Enumerations\Header::REFERENCES,
 //			\MailSo\Mime\Enumerations\Header::X_DRAFT_INFO,
+//			\MailSo\Mime\Enumerations\Header::RECEIVED_SPF,
+//			\MailSo\Mime\Enumerations\Header::AUTHENTICATION_RESULTS,
 //		), true);
 	}
 
@@ -357,7 +359,7 @@ class MailClient
 
 		$oBodyStructure = null;
 		$oMessage = false;
-		
+
 		$aBodyPeekMimeIndexes = array();
 		$aSignatureMimeIndexes = array();
 
@@ -405,7 +407,7 @@ class MailClient
 				{
 					$sLine .= '<0.'.((int) $iBodyTextLimit).'>';
 				}
-				
+
 				$aFetchItems[] = $sLine;
 			}
 		}
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/Header.php b/rainloop/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/Header.php
index 8b2bb1caf..73fcb00fa 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/Header.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/Header.php
@@ -38,6 +38,15 @@ class Header
 
 	const SENSITIVITY = 'Sensitivity';
 
+	const RECEIVED_SPF = 'Received-SPF';
+	const AUTHENTICATION_RESULTS = 'Authentication-Results';
+	const X_DKIM_AUTHENTICATION_RESULTS = 'X-DKIM-Authentication-Results';
+
+	const DKIM_SIGNATURE = 'DKIM-Signature';
+	const DOMAINKEY_SIGNATURE = 'DomainKey-Signature';
+
+	const X_SPAM_STATUS = 'X-Spam-Status';
+
 	const RETURN_RECEIPT_TO = 'Return-Receipt-To';
 	const DISPOSITION_NOTIFICATION_TO = 'Disposition-Notification-To';
 	const X_CONFIRM_READING_TO = 'X-Confirm-Reading-To';
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Mime/Message.php b/rainloop/v/0.0.0/app/libraries/MailSo/Mime/Message.php
index 36cc6e937..9f1b168e5 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Mime/Message.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Mime/Message.php
@@ -502,17 +502,23 @@ class Message
 	 */
 	private function generateNewMessageId($sHostName = '')
 	{
-		if (0 === strlen($sHostName))
+		if (0 === \strlen($sHostName))
 		{
 			$sHostName = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : '';
 		}
 
+		if (empty($sHostName) && \MailSo\Base\Utils::FunctionExistsAndEnabled('php_uname'))
+		{
+			$sHostName = \php_uname('n');
+		}
+
 		if (empty($sHostName))
 		{
 			$sHostName = 'localhost';
 		}
 
-		return '<'.md5(rand(100000, 999999).time().$sHostName).'@'.$sHostName.'>';
+		return '<'.\md5(\rand(100000, 999999).\time().$sHostName.
+			(\MailSo\Base\Utils::FunctionExistsAndEnabled('getmypid') ? @\getmypid() : '')).'@'.$sHostName.'>';
 	}
 
 	/**