--- mailgw.py	Thu Mar 14 23:59:24 2002
+++ ..\..\ru0.4.1\roundup\mailgw.py	Fri May 31 00:09:10 2002
@@ -547,6 +547,23 @@
                     break
                 # parse it
                 subtype = part.gettype()
+                
+                # outlook express patch
+                # if multipart/alternative, 
+                #   get the first text/plain
+                if subtype == 'multipart/alternative':
+                    # skip over the intro to the first boundary
+                    p = part.getPart()
+                    while 1:
+                        p = part.getPart()
+                        if p is None:
+                            break
+                        st = p.gettype()
+                        if st == 'text/plain':
+                            subtype = st
+                            part = p
+                            break
+                            
                 if subtype == 'text/plain' and not content:
                     # The first text/plain part is the message content.
                     content = self.get_part_data_decoded(part)