--- a/emailuis/emailui/inc/FreestyleMessageHeaderHTML.h	Fri Feb 19 22:37:30 2010 +0200
+++ b/emailuis/emailui/inc/FreestyleMessageHeaderHTML.h	Fri Mar 12 15:41:14 2010 +0200
@@ -37,25 +37,28 @@
                                   RWriteStream& aWriteStream, 
                                   TInt aVisibleWidth, 
                                   TInt aScrollPosition,
-                                  TBidiText::TDirectionality aDirectionality = TBidiText::ELeftToRight);
+                                  const TBool aAutoLoadImages,                                  
+                                  const TBool aExpanded );
     IMPORT_C static void ExportL( CFSMailMessage& aMailMessage, 
                                   RFile& aFile, 
                                   TInt aVisibleWidth, 
                                   TInt aScrollPosition,
-                                  TBidiText::TDirectionality aDirectionality = TBidiText::ELeftToRight);
+                                  const TBool aAutoLoadImages,
+                                  const TBool aExpanded );
     IMPORT_C static void ExportL( CFSMailMessage& aMailMessage, 
                                   RFs& aFs, 
                                   const TPath& aFilePath, 
                                   TInt aVisibleWidth, 
                                   TInt aScrollPosition,
-                                  TBidiText::TDirectionality aDirectionality = TBidiText::ELeftToRight);
+                                  const TBool aAutoLoadImages,
+                                  const TBool aExpanded );
     
     IMPORT_C static CFreestyleMessageHeaderHTML* NewL( CFSMailMessage& aMailMessage,
                                                        RWriteStream& aWriteStream,
                                                        TInt aVisibleWidth,
                                                        TInt aScrollPosition,
-                                                       TBidiText::TDirectionality aDirectionality = TBidiText::ELeftToRight
-                                                       );
+                                                       const TBool aAutoLoadImages,
+                                                       const TBool aExpanded );
     
     ~CFreestyleMessageHeaderHTML();
     
@@ -66,7 +69,8 @@
                                  RWriteStream& aWriteStream,
                                  TInt aVisibleWidth,
                                  TInt aScrollPosition,
-                                 TBidiText::TDirectionality aDirectionality);
+                                 const TBool aAutoLoadImages,
+                                 const TBool aExpanded );
     void ConstructL();
     
     void HTMLStartL() const;
@@ -77,6 +81,8 @@
     void HTMLMetaL() const;
     void HTMLHeaderEndL() const;
 
+    void ExportDisplayImagesTableL() const;
+
     void ExportHTMLBodyL() const;
     void HTMLBodyStartL() const;
     void HTMLBodyEndL() const;
@@ -152,9 +158,9 @@
     RWriteStream&               iWriteStream;
     TInt                        iVisibleWidth;
     TInt                        iScrollPosition;
-    TBidiText::TDirectionality  iDirectionality;
+    TBool                       iAutoLoadImages;
     TBool                       iMirrorLayout;
-     
+    TBool                       iExpanded;
     RPointerArray<CFSMailMessagePart> iAttachments;
 };