diff --git a/install.rdf b/install.rdf
index 3bafb68..178dfdc 100644
--- a/install.rdf
+++ b/install.rdf
@@ -6,7 +6,7 @@
   <Description about="urn:mozilla:install-manifest">
 		<em:id>todo.txt@xseth.nl</em:id>
     <em:name>Todo.txt Extension</em:name>
-    <em:version>0.3</em:version>
+    <em:version>0.4</em:version>
 		<em:type>2</em:type>
     <em:creator>Roy Kokkelkoren</em:creator>
 		<em:description>Thunderbird extension for the Todo.txt application</em:description>
diff --git a/modules/todoclient.js b/modules/todoclient.js
index e2dfe23..5ec391d 100644
--- a/modules/todoclient.js
+++ b/modules/todoclient.js
@@ -164,13 +164,15 @@ let todoClient = {
       this.writeTodo(todo);
     else
       throw Components.Exception("Deleted item not found in Todo.txt",Components.results.NS_ERROR_UNEXPECTED);
-
   },
 
   setTodo: function(){
 			let parseBlob = "";
       let prefs = this.getPreferences();
 
+      let utf8Converter = Components.classes["@mozilla.org/intl/utf8converterservice;1"].
+            getService(Components.interfaces.nsIUTF8ConverterService);
+
 			if(prefs.prefHasUserValue('todo-txt')){
 
         todoFile = prefs.getComplexValue("todo-txt", Components.interfaces.nsIFile);
@@ -178,7 +180,8 @@ let todoClient = {
                               createInstance(Components.interfaces.nsIFileInputStream);
 
         fstream.init(todoFile, -1, 0, 0);
-        let data = NetUtil.readInputStreamToString(fstream, fstream.available());
+        let str = NetUtil.readInputStreamToString(fstream, fstream.available());
+        let data = utf8Converter.convertURISpecToUTF8(str, "UTF-8"); 
         parseBlob += data;
       } 
 
@@ -189,7 +192,8 @@ let todoClient = {
                               createInstance(Components.interfaces.nsIFileInputStream);
 
         fstream.init(doneFile, -1, 0, 0);
-        let data = NetUtil.readInputStreamToString(fstream, fstream.available());
+        let str = NetUtil.readInputStreamToString(fstream, fstream.available());
+        let data = utf8Converter.convertURISpecToUTF8(str, "UTF-8"); 
         parseBlob += "\n"+data;
       }