diff --git a/Mage.Client/release/startClient.bat b/Mage.Client/release/startClient.bat
index 6ebff32baba..22acbfcd3b7 100644
--- a/Mage.Client/release/startClient.bat
+++ b/Mage.Client/release/startClient.bat
@@ -4,4 +4,4 @@ set JAVA_HOME="C:\Program Files\Java\jre7\"
 set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH%
 set PATH=%JAVA_HOME%/bin;%PATH%
 :NOJAVADIR
-java -Xmx1024m -Dfile.encoding=UTF-8 -Djava.net.preferIPv4Stack=true -jar .\lib\mage-client-${project.version}.jar
\ No newline at end of file
+java -Xmx2000m -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -Djava.net.preferIPv4Stack=true -jar .\lib\mage-client-${project.version}.jar
\ No newline at end of file
diff --git a/Mage.Client/release/startClient.command b/Mage.Client/release/startClient.command
index 1c259967a9a..effd525f0b5 100644
--- a/Mage.Client/release/startClient.command
+++ b/Mage.Client/release/startClient.command
@@ -2,4 +2,4 @@
 
 cd "`dirname "$0"`"
 
-java -Xmx1024m -Dfile.encoding=UTF-8 -Djava.net.preferIPv4Stack=true -jar ./lib/mage-client-${project.version}.jar &
\ No newline at end of file
+java -Xmx2000m -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -Djava.net.preferIPv4Stack=true -jar ./lib/mage-client-${project.version}.jar &
\ No newline at end of file
diff --git a/Mage.Client/release/startClient.sh b/Mage.Client/release/startClient.sh
index e9f64a2c8d3..b5028fb28d2 100644
--- a/Mage.Client/release/startClient.sh
+++ b/Mage.Client/release/startClient.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-java -Xmx1024m -Dfile.encoding=UTF-8 -Djava.net.preferIPv4Stack=true -jar ./lib/mage-client-${project.version}.jar &
\ No newline at end of file
+java -Xmx2000m -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -Djava.net.preferIPv4Stack=true -jar ./lib/mage-client-${project.version}.jar &
\ No newline at end of file
diff --git a/Mage.Client/release/startClientWin7.bat b/Mage.Client/release/startClientWin7.bat
index 1c8a443a22f..5008d8cb19a 100644
--- a/Mage.Client/release/startClientWin7.bat
+++ b/Mage.Client/release/startClientWin7.bat
@@ -4,4 +4,4 @@ set JAVA_HOME="C:\Program Files (x86)\Java\jre7\"
 set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH%
 set PATH=%JAVA_HOME%/bin;%PATH%
 :NOJAVADIR
-java -Xmx1024m -Dfile.encoding=UTF-8 -Djava.net.preferIPv4Stack=true -Dfile.encoding=UTF-8 -jar .\lib\mage-client-${project.version}.jar
\ No newline at end of file
+java -Xmx2000m -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -Djava.net.preferIPv4Stack=true -Dfile.encoding=UTF-8 -jar .\lib\mage-client-${project.version}.jar
\ No newline at end of file
diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java
index 376f7c40bf6..07ce7d54e7d 100644
--- a/Mage.Client/src/main/java/mage/client/MageFrame.java
+++ b/Mage.Client/src/main/java/mage/client/MageFrame.java
@@ -1502,7 +1502,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
         if (!Charset.defaultCharset().toString().equals("UTF-8")) {
             LOGGER.warn("WARNING, bad charset. Some images will not be downloaded. You must:");
             LOGGER.warn("* Open launcher -> settings -> java -> client java options");
-            LOGGER.warn("* Insert additional command at the the end: -Dfile.encoding=UTF-8");
+            LOGGER.warn("* Insert at the the end: -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8");
         }
 
         startTime = System.currentTimeMillis();