diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 1693397f6fa..45a6019db3d 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -417,7 +417,8 @@ class mail_message(osv.osv):
             if 'text/html' in msg.get('content-type', ''):
                 msg['body_html'] =  body
                 msg['subtype'] = 'html'
-                body = tools.html2plaintext(body)
+                if body:
+                    body = tools.html2plaintext(body)
             msg['body_text'] = tools.ustr(body, encoding)
 
         attachments = []
diff --git a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs
index cf1578d903b..b5bc2fc4472 100644
--- a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs
+++ b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs
@@ -144,7 +144,16 @@ namespace OpenERPOutlookPlugin
                 OpenERPConnect openerp_connect = openerp_outlook.Connection;
                 ArrayList args = new ArrayList();               
                 Hashtable vals = new Hashtable();
-                string email = Tools.GetHeader(mail); //TODO: Outlook.MailItem Should be Converted into MIME Message
+                string email;
+                if (Tools.GetHeader(mail)!= null)
+                {
+                    email = Tools.GetHeader(mail); //TODO: Outlook.MailItem Should be Converted into MIME Message
+                }
+                else
+                {
+                    email = "";
+                }
+                
                 args.Add(model);
                 args.Add(email.ToString());
                 args.Add(thread_id);              
diff --git a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj
index 8fbcb0a2ec4..6fdd26b35d0 100644
--- a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj
+++ b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj
@@ -44,6 +44,7 @@
     <IncrementalBuild>false</IncrementalBuild>
     <RegisterForComInterop>true</RegisterForComInterop>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>false</DebugSymbols>
@@ -241,12 +242,6 @@
     <Content Include="Resources\Success.gif" />
     <Content Include="Resources\Task.png" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenERPClient\OpenERPClient.csproj">
-      <Project>{8E62B8DF-E3A2-4429-A820-FB8A31C2EB00}</Project>
-      <Name>OpenERPClient</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
       <Visible>False</Visible>
@@ -264,6 +259,12 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\OpenERPClient\OpenERPClient.csproj">
+      <Project>{8E62B8DF-E3A2-4429-A820-FB8A31C2EB00}</Project>
+      <Name>OpenERPClient</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PreBuildEvent>
diff --git a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi
index 45f2d7cd6f4..a31471c28ba 100644
Binary files a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi and b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi differ
diff --git a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi
index 7e15551928c..87cac88be70 100644
Binary files a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi and b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi differ