Properly parse apple mail

1 files changed, 9 insertions, 0 deletions

diff --git a/mail/src/leap/mail/walk.py b/mail/src/leap/mail/walk.py
index dd3b7451..27d672c3 100644
--- a/mail/src/leap/mail/walk.py
+++ b/mail/src/leap/mail/walk.py
@@ -143,6 +143,15 @@ def walk_msg_tree(parts, body_phash=None):
         pv = list(get_parts_vector(parts))
         wv = getwv(pv)
 
+    if all(x == 1 for x in pv):
+        # special case in the rightmost element
+        main_pmap = parts[0]['part_map']
+        last_part = max(main_pmap.keys())
+        main_pmap[last_part]['part_map'] = {}
+        for partind in range(len(pv) - 1):
+            print partind+1, len(parts)
+            main_pmap[last_part]['part_map'][partind] = parts[partind+1]
+
     outer = parts[0]
     outer.pop('headers')
     if not "part_map" in outer: