From af3d0dcb0092d4cee03681a6baf452ea02999f69 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Fri, 22 Apr 2022 14:51:18 +0200
Subject: [PATCH] Changes for #342

---
 snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php | 2 ++
 snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php    | 6 ++++++
 .../0.0.0/app/libraries/MailSo/Mime/Enumerations/Header.php | 3 +++
 3 files changed, 11 insertions(+)

diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
index e665f259b..701e83af0 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
@@ -106,6 +106,8 @@ class MailClient
 			MimeHeader::AUTHENTICATION_RESULTS,
 			MimeHeader::X_DKIM_AUTHENTICATION_RESULTS,
 			MimeHeader::LIST_UNSUBSCRIBE,
+			// https://autocrypt.org/level1.html#the-autocrypt-header
+			MimeHeader::AUTOCRYPT,
 			// SPAM
 			MimeHeader::X_SPAM_STATUS,
 //			MimeHeader::X_SPAM_FLAG,
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php
index 03a2b1bdb..2f9bb11f9 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php
@@ -73,6 +73,9 @@ class Message implements \JsonSerializable
 
 		$sReadReceipt = '',
 
+		// https://autocrypt.org/level1.html#the-autocrypt-header
+		$sAutocrypt = '',
+
 		$aUnsubsribeLinks = array(),
 
 		$aThreads = array(),
@@ -472,6 +475,8 @@ class Message implements \JsonSerializable
 					$oMessage->aDraftInfo = array($sType, $iUid, $sFolder);
 				}
 			}
+
+			$oMessage->sAutocrypt = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::AUTOCRYPT);
 		}
 		else if ($oFetchResponse->GetEnvelope())
 		{
@@ -648,6 +653,7 @@ class Message implements \JsonSerializable
 			'Threads' => $this->aThreads,
 			'UnsubsribeLinks' => $this->aUnsubsribeLinks,
 			'ReadReceipt' => '',
+			'Autocrypt' => $this->sAutocrypt,
 
 			'Attachments' => $this->oAttachments ? $this->oAttachments->SpecData() : null,
 
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/Header.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/Header.php
index 395ff4b4a..5d0e4e738 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/Header.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/Header.php
@@ -88,5 +88,8 @@ abstract class Header
 		IMPORTANCE = 'Importance',
 		X_PRIORITY = 'X-Priority',
 
+		// https://autocrypt.org/level1.html#the-autocrypt-header
+		AUTOCRYPT = 'Autocrypt',
+
 		LIST_UNSUBSCRIBE = 'List-Unsubscribe';
 }