@@ -177,6 +177,11 @@ public bool HasSmimeDetachedSignature
             }
         }
 
+        /// <summary>
+        /// Indicates whether the message is in HTML format or not
+        /// </summary>
+        public bool IsHtml { get; set; }
+
         /// <summary>
         /// Indicates whether the message has been encrypted using S/MIME.
         /// </summary>
 
@@ -199,6 +199,7 @@ private static void DispatchPart(MimePart part, ref Message message)
                     }
                     else if (part.ContentType.SubType.Equals("html"))
                     {
+                        message.IsHtml = true;
                         message.BodyHtml.Charset = part.Charset;
                         message.BodyHtml.Text = part.TextContent;
                     }
@@ -720,7 +721,7 @@ public static Message ParseMessage(byte[] data)
         {
             //string msg = System.Text.Encoding.ASCII.GetString(data);
 #if !PocketPC
-            string msg = System.Text.Encoding.GetEncoding("iso-8859-1").GetString(data,0,data.Length);
+            string msg = System.Text.Encoding.UTF8.GetString(data,0,data.Length);
 #else
             string msg = Pop3Client.PPCEncode.GetString(data, 0, data.Length);
 #endif
 
@@ -25,7 +25,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -41,6 +41,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -99,6 +100,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="CommandOptions.cs" />
     <Compile Include="Fetch.cs" />
     <Compile Include="Flag.cs" />
     <Compile Include="FlagCollection.cs" />
Original file line number	Diff line number	Diff line change
`@@ -177,6 +177,11 @@ public bool HasSmimeDetachedSignature`
`177`	`177`	`}`
`178`	`178`	`}`
`179`	`179`
	`180`	`+ /// <summary>`
	`181`	`+ /// Indicates whether the message is in HTML format or not`
	`182`	`+ /// </summary>`
	`183`	`+ public bool IsHtml { get; set; }`
	`184`	`+`
`180`	`185`	`/// <summary>`
`181`	`186`	`/// Indicates whether the message has been encrypted using S/MIME.`
`182`	`187`	`/// </summary>`
Original file line number	Diff line number	Diff line change
`@@ -199,6 +199,7 @@ private static void DispatchPart(MimePart part, ref Message message)`
`199`	`199`	`}`
`200`	`200`	`else if (part.ContentType.SubType.Equals("html"))`
`201`	`201`	`{`
	`202`	`+ message.IsHtml = true;`
`202`	`203`	`message.BodyHtml.Charset = part.Charset;`
`203`	`204`	`message.BodyHtml.Text = part.TextContent;`
`204`	`205`	`}`
`@@ -720,7 +721,7 @@ public static Message ParseMessage(byte[] data)`
`720`	`721`	`{`
`721`	`722`	`//string msg = System.Text.Encoding.ASCII.GetString(data);`
`722`	`723`	`#if !PocketPC`
`723`		`- string msg = System.Text.Encoding.GetEncoding("iso-8859-1").GetString(data,0,data.Length);`
	`724`	`+ string msg = System.Text.Encoding.UTF8.GetString(data,0,data.Length);`
`724`	`725`	`#else`
`725`	`726`	`string msg = Pop3Client.PPCEncode.GetString(data, 0, data.Length);`
`726`	`727`	`#endif`