From 9c2b3bd473f14119305bdccee148ee86a544ba97 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 9 Nov 2021 17:10:17 -0500
Subject: [PATCH] fix(mail(dav)): add support for property
 {DAV:}getcontentlength

---
 SoObjects/Mailer/SOGoMailFolder.m | 2 ++
 SoObjects/Mailer/SOGoMailObject.m | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m
index de2b75b31..6a93b43e9 100644
--- a/SoObjects/Mailer/SOGoMailFolder.m
+++ b/SoObjects/Mailer/SOGoMailFolder.m
@@ -1776,6 +1776,8 @@ static NSInteger _compareFetchResultsByUID (id entry1, id entry2, NSArray *uids)
                              forKey: @"{urn:schemas:mailheader:}references"];
       [davIMAPFieldsTable setObject: @"BODY[HEADER.FIELDS (SUBJECT)]"
                              forKey: @"{DAV:}displayname"];
+      [davIMAPFieldsTable setObject: @"RFC822.SIZE"
+                             forKey: @"{DAV:}getcontentlength"];
       [davIMAPFieldsTable setObject: @"BODY[HEADER.FIELDS (TO)]"
                              forKey: @"{urn:schemas:mailheader:}to"];
     }
diff --git a/SoObjects/Mailer/SOGoMailObject.m b/SoObjects/Mailer/SOGoMailObject.m
index d96685335..da596ad2a 100644
--- a/SoObjects/Mailer/SOGoMailObject.m
+++ b/SoObjects/Mailer/SOGoMailObject.m
@@ -1273,7 +1273,7 @@ static BOOL debugSoParts       = NO;
 
 - (NSString *) davContentLength
 {
-  return [[self fetchCoreInfos] valueForKey: @"size"];
+  return [NSString stringWithFormat: @"%@", [[self fetchCoreInfos] valueForKey: @"size"]];
 }
 
 - (NSDate *) davCreationDate