diff --git a/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/IpnbFileEditor.java b/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/IpnbFileEditor.java
index b8138fe6d219..581f8511c31f 100644
--- a/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/IpnbFileEditor.java
+++ b/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/IpnbFileEditor.java
@@ -103,10 +103,6 @@ public class IpnbFileEditor extends UserDataHolderBase implements FileEditor {
     new IpnbHeading6CellAction().registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke("ctrl shift 6")), myIpnbFilePanel);
   }
 
-  public JScrollPane getScrollPane() {
-    return myScrollPane;
-  }
-
   private JPanel createControlPanel() {
     final JPanel controlPanel = new JPanel();
     controlPanel.setBackground(IpnbEditorUtil.getBackground());
diff --git a/python/ipnb/src/org/jetbrains/plugins/ipnb/format/IpnbParser.java b/python/ipnb/src/org/jetbrains/plugins/ipnb/format/IpnbParser.java
index b9c48ebfe8ab..3f9abb5515e3 100644
--- a/python/ipnb/src/org/jetbrains/plugins/ipnb/format/IpnbParser.java
+++ b/python/ipnb/src/org/jetbrains/plugins/ipnb/format/IpnbParser.java
@@ -15,10 +15,8 @@ import org.jetbrains.plugins.ipnb.editor.panels.IpnbFilePanel;
 import org.jetbrains.plugins.ipnb.format.cells.*;
 import org.jetbrains.plugins.ipnb.format.cells.output.*;
 
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.StringWriter;
+import java.io.*;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -101,20 +99,25 @@ public class IpnbParser {
 
   private static void writeToFile(@NotNull final String path, @NotNull final String json) {
     final File file = new File(path);
-    FileWriter writer = null;
     try {
-      writer = new FileWriter(file);
-      writer.write(json);
-    } catch (IOException e) {
-      LOG.error(e);
-    }
-    finally {
+      final FileOutputStream fileOutputStream = new FileOutputStream(file);
+      final OutputStreamWriter writer = new OutputStreamWriter(fileOutputStream, Charset.forName("UTF-8").newEncoder());
       try {
-        if (writer != null)
-          writer.close();
+        writer.write(json);
       } catch (IOException e) {
         LOG.error(e);
       }
+      finally {
+        try {
+          writer.close();
+          fileOutputStream.close();
+        } catch (IOException e) {
+          LOG.error(e);
+        }
+      }
+    }
+    catch (FileNotFoundException e) {
+      LOG.error(e);
     }
   }