diff --git a/cli-lanterna/src/main/groovy/com/muwire/clilanterna/CliLanterna.groovy b/cli-lanterna/src/main/groovy/com/muwire/clilanterna/CliLanterna.groovy
index 54caf991..c5def62f 100644
--- a/cli-lanterna/src/main/groovy/com/muwire/clilanterna/CliLanterna.groovy
+++ b/cli-lanterna/src/main/groovy/com/muwire/clilanterna/CliLanterna.groovy
@@ -82,14 +82,14 @@ class CliLanterna {
             props.setDownloadLocation(downloadLocationFile)
             props.incompleteLocation = incompletesLocationFile
             
-            propsFile.withOutputStream { 
+            propsFile.withPrintWriter("UTF-8", { 
                 props.write(it)
-            }
+            })
         } else {
             props = new Properties()
-            propsFile.withInputStream { 
+            propsFile.withReader("UTF-8", { 
                 props.load(it)
-            }
+            })
             props = new MuWireSettings(props)
         }
         props.updateType = "cli-lanterna"
diff --git a/cli-lanterna/src/main/groovy/com/muwire/clilanterna/TrustView.groovy b/cli-lanterna/src/main/groovy/com/muwire/clilanterna/TrustView.groovy
index 7d740540..ed7f5638 100644
--- a/cli-lanterna/src/main/groovy/com/muwire/clilanterna/TrustView.groovy
+++ b/cli-lanterna/src/main/groovy/com/muwire/clilanterna/TrustView.groovy
@@ -199,6 +199,6 @@ class TrustView extends BasicWindow {
     
     private void saveMuSettings() {
         File settingsFile = new File(core.home,"MuWire.properties")
-        settingsFile.withOutputStream { core.muOptions.write(it) }
+        settingsFile.withPrintWriter("UTF-8",{ core.muOptions.write(it) })
     }
 }