Index: Wiki/src/main/resources/MSOffice/GetEncodingService.xml
===================================================================
--- Wiki/src/main/resources/MSOffice/GetEncodingService.xml	(revision 0)
+++ Wiki/src/main/resources/MSOffice/GetEncodingService.xml	(revision 0)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<xwikidoc>
+<web>MSOffice</web>
+<name>GetEncodingService</name>
+<language></language>
+<defaultLanguage>en</defaultLanguage>
+<translation>0</translation>
+<parent></parent>
+<creator>XWiki.Admin</creator>
+<author>XWiki.Admin</author>
+<customClass></customClass>
+<contentAuthor>XWiki.Admin</contentAuthor>
+<creationDate>1239491696000</creationDate>
+<date>1239493018000</date>
+<contentUpdateDate>1239493018000</contentUpdateDate>
+<version>2.1</version>
+<title>GetEncodingsService</title>
+<template></template>
+<defaultTemplate></defaultTemplate>
+<validationScript></validationScript>
+<comment></comment>
+<minorEdit>false</minorEdit>
+<syntaxId>xwiki/1.0</syntaxId>
+<hidden>false</hidden>
+<object>
+<class>
+<name>XWiki.TagClass</name>
+<customClass></customClass>
+<customMapping></customMapping>
+<defaultViewSheet></defaultViewSheet>
+<defaultEditSheet></defaultEditSheet>
+<defaultWeb></defaultWeb>
+<nameField></nameField>
+<validationScript></validationScript>
+<tags>
+<cache>0</cache>
+<displayType>input</displayType>
+<multiSelect>1</multiSelect>
+<name>tags</name>
+<number>1</number>
+<prettyName>Tags</prettyName>
+<relationalStorage>1</relationalStorage>
+<separator> </separator>
+<separators> ,|</separators>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<values></values>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</tags>
+</class>
+<name>MSOffice.GetEncodingService</name>
+<number>0</number>
+<className>XWiki.TagClass</className>
+<guid>9fd947e4-3ebe-41b0-ba90-2cd80b3c7df3</guid>
+<property>
+<tags/>
+</property>
+</object>
+<content>$xwiki.getEncoding()</content>
+</xwikidoc>
Index: XWikiLib/Clients/IXWikiClient.cs
===================================================================
--- XWikiLib/Clients/IXWikiClient.cs	(revision 18614)
+++ XWikiLib/Clients/IXWikiClient.cs	(working copy)
@@ -20,6 +20,14 @@
         { 
             get;
         }
+        
+        /// <summary>
+        /// Specifies the encoding from the XWiki server.
+        /// </summary>
+        Encoding ServerEncoding
+        {
+            get;
+        }
 
         /// <summary>
         /// Basic authentification method.
@@ -177,6 +185,6 @@
         /// <param name="documentFullName">The full name of the xwiki page</param>
         /// <param name="xwikiAction">The struts action.</param>
         /// <returns>The URL for the specified page and action.</returns>
-        String GetURL(String documentFullName, String xwikiAction);        
+        String GetURL(String documentFullName, String xwikiAction);
     }
 }
Index: XWikiLib/Clients/XWikiHTTPClient.cs
===================================================================
--- XWikiLib/Clients/XWikiHTTPClient.cs	(revision 18614)
+++ XWikiLib/Clients/XWikiHTTPClient.cs	(working copy)
@@ -28,6 +28,7 @@
                                           "rememeberme",
                                           "validation"};
         private bool isLoggedIn;
+        private Encoding encoding;
         /// <param name="serverURL">The url of the server.</param>
         /// <param name="username">The username used to authenticate.</param>
         /// <param name="password">The passowrd used to authenticate.</param>
@@ -126,6 +127,14 @@
                 return false;
             }
             isLoggedIn = true;
+            try
+            {
+                encoding = GetEncoding();
+            }
+            catch (InvalidEncodingNameException ex) 
+            {
+                encoding = null;
+            }
             return true;
         }
 
@@ -149,6 +158,34 @@
         }
 
         /// <summary>
+        /// Gets the encoding of the wiki instance.
+        /// </summary>
+        /// <returns>The character encoding from the XWiki server.</returns>
+        private Encoding GetEncoding()
+        {
+            Encoding enc;
+
+            InsertCookies();
+            String uri = ServerURL + XWikiURLs.GetEncoding;
+            Stream data = webClient.OpenRead(uri);
+            StreamReader reader = new StreamReader(data);
+            String response = reader.ReadToEnd();
+            data.Close();
+            reader.Close();
+            try
+            {
+                enc = Encoding.GetEncoding(response);
+            }
+            catch (ArgumentException e)
+            {
+                // TODO: Log this error
+                throw new InvalidEncodingNameException();
+
+            }
+            return enc;
+        }
+
+        /// <summary>
         /// Starts reading from an address.
         /// </summary>
         /// <param name="address">The adress.</param>
@@ -317,6 +354,28 @@
         }
 
         /// <summary>
+        /// Specifies if the current encoding from the XWiki server.
+        /// </summary>
+        public Encoding ServerEncoding
+        {
+            get
+            {
+                if (encoding == null) 
+                {
+                    try
+                    {
+                        encoding = GetEncoding();
+                    }
+                    catch (InvalidEncodingNameException ex) 
+                    {
+                        encoding = Encoding.GetEncoding("ISO-8859-1");
+                    }
+                }
+                return encoding;
+            }
+        }
+
+        /// <summary>
         /// Authenticates the user to the server.
         /// </summary>
         /// <param name="username">The username.</param>
Index: XWikiLib/Clients/XWikiXMLRPCClient.cs
===================================================================
--- XWikiLib/Clients/XWikiXMLRPCClient.cs	(revision 18614)
+++ XWikiLib/Clients/XWikiXMLRPCClient.cs	(working copy)
@@ -8,6 +8,7 @@
     public class XWikiXMLRPCClient : IXWikiClient
     {
         private bool isLoggedIn;
+        private Encoding encoding;
         /// <summary>
         /// XML-RPC implementation of IXWikiCLient.
         /// Provides access to the main features of XWiki using the XML-RPC API.
@@ -29,8 +30,19 @@
                 return isLoggedIn;
             }
         }
-              
+
         /// <summary>
+        /// Specifies if the current encoding from the XWiki server.
+        /// </summary>
+        public Encoding ServerEncoding
+        {
+            get
+            {
+                return encoding;
+            }
+        }
+      
+        /// <summary>
         /// Authenticates the user to the server.
         /// </summary>
         /// <returns>True if the operation succedes. False if the operation fails.</returns>
Index: XWikiLib/XWiki/XWikiURLFactory.cs
===================================================================
--- XWikiLib/XWiki/XWikiURLFactory.cs	(revision 18614)
+++ XWikiLib/XWiki/XWikiURLFactory.cs	(working copy)
@@ -16,6 +16,7 @@
         static String wikiStructureURL = "/xwiki/bin/view/MSOffice/StructureService?xpage=plain";
         static String attachmentServiceURL = "/xwiki/bin/view/MSOffice/AttachmentService?xpage=plain";
         static String protectedPagesURL = "/xwiki/bin/view/MSOffice/ProtectedPages?xpage=plain";
+        static String getEncoding = "/xwiki/bin/view/MSOffice/GetEncodingService?xpage=plain";
 
         /// <summary>
         /// Gets or sets the URL of the service that handles attachments.
@@ -72,5 +73,15 @@
             get { return protectedPagesURL; }
             set { protectedPagesURL = value; }
         }
+
+        /// <summary>
+        /// Gets the encoding of the wiki.
+        /// </summary>
+        public static String GetEncoding
+        {
+            get { return getEncoding; }
+            set { getEncoding = value; }
+        }
+
     }
 }
Index: XWikiLib/XWikiLib.csproj
===================================================================
--- XWikiLib/XWikiLib.csproj	(revision 18614)
+++ XWikiLib/XWikiLib.csproj	(working copy)
@@ -56,6 +56,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Clients\HTTPResponses.cs" />
+    <Compile Include="Clients\InvalidEncodingNameException.cs" />
     <Compile Include="Clients\IXWikiClient.cs" />
     <Compile Include="Clients\XWikiXMLRPCClient.cs" />
     <Compile Include="Html\HtmlUtil.cs" />
Index: XWord/AddinActions.cs
===================================================================
--- XWord/AddinActions.cs	(revision 18614)
+++ XWord/AddinActions.cs	(working copy)
@@ -406,7 +406,7 @@
                     addin.AddinStatus.Syntax = addin.DefaultSyntax;
                 }
                 //Convert the source to the propper encoding.
-                Encoding iso = Encoding.GetEncoding("ISO-8859-1");
+                Encoding iso = Client.ServerEncoding;
                 byte[] content = Encoding.Unicode.GetBytes(cleanHTML);
                 byte[] wikiContent = null;
                 wikiContent = Encoding.Convert(Encoding.Unicode, iso, content);
@@ -485,7 +485,7 @@
                 pageContent = pageContent + newPageText;
                 FileStream stream = new FileStream(localFileName, FileMode.Create);
                 //byte[] buffer = UTF8Encoding.UTF8.GetBytes(pageContent.ToString());
-                Encoding iso = Encoding.GetEncoding("ISO-8859-1");
+                Encoding iso = Client.ServerEncoding;
                 byte[] buffer = iso.GetBytes(pageContent);
                 stream.Write(buffer, 0, buffer.Length);
                 stream.Close();