Index: /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/jfc/commands/CMDpreprocessJFC.java
===================================================================
--- /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/jfc/commands/CMDpreprocessJFC.java	(revision 308)
+++ /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/jfc/commands/CMDpreprocessJFC.java	(revision 309)
@@ -2,8 +2,11 @@
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
 import java.security.InvalidParameterException;
 import java.util.List;
@@ -42,8 +45,12 @@
 
 		File file = new File(source);
-		FileReader fileReader;
+		InputStreamReader reader;
 		try {
-			fileReader = new FileReader(file);
+			FileInputStream fis = new FileInputStream(file);
+			reader = new InputStreamReader(fis, "UTF-16");
 		} catch (FileNotFoundException e) {
+			Console.printerrln(e.getMessage());
+			return;
+		} catch (UnsupportedEncodingException e) {
 			Console.printerrln(e.getMessage());
 			return;
@@ -51,6 +58,6 @@
 		char[] buffer = new char[(int) file.length()];
 		try {
-			fileReader.read(buffer);
-			fileReader.close();
+			reader.read(buffer);
+			reader.close();
 		} catch (IOException e) {
 			Console.printerrln(e.getMessage());
@@ -60,7 +67,8 @@
 		String content = new String(buffer).trim();
 
-		FileWriter writer;
+		OutputStreamWriter writer;
 		try {
-			writer = new FileWriter(target);
+			FileOutputStream fos = new FileOutputStream(target);
+			writer = new OutputStreamWriter(fos, "UTF-16");
 		} catch (IOException e) {
 			Console.printerrln(e.getMessage());
@@ -72,4 +80,5 @@
 				writer.write("</sessions>");
 			}
+			writer.close();
 		} catch (IOException e) {
 			Console.printerrln(e.getMessage());
Index: /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swt/CommandHistoryDialog.java
===================================================================
--- /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swt/CommandHistoryDialog.java	(revision 308)
+++ /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swt/CommandHistoryDialog.java	(revision 309)
@@ -137,5 +137,5 @@
 					OutputStreamWriter writer = null;
 					try {
-						writer = new OutputStreamWriter(new FileOutputStream(file));
+						writer = new OutputStreamWriter(new FileOutputStream(file), "UTF-8");
 					} catch (IOException e) {
 						Console.printerrln("Unable to open file for writing (read-only file):"