diff --git a/src/java/JavaFileStorage/bin/javafilestorage.jar b/src/java/JavaFileStorage/bin/javafilestorage.jar
index 9143516d..cd84ce46 100644
Binary files a/src/java/JavaFileStorage/bin/javafilestorage.jar and b/src/java/JavaFileStorage/bin/javafilestorage.jar differ
diff --git a/src/java/KP2AKdbLibrary/bin/kp2akdblibrary.jar b/src/java/KP2AKdbLibrary/bin/kp2akdblibrary.jar
index 5be5b59a..cdb34248 100644
Binary files a/src/java/KP2AKdbLibrary/bin/kp2akdblibrary.jar and b/src/java/KP2AKdbLibrary/bin/kp2akdblibrary.jar differ
diff --git a/src/java/KP2ASoftKeyboard2/java/src/keepass2android/kbbridge/ImeSwitcher.java b/src/java/KP2ASoftKeyboard2/java/src/keepass2android/kbbridge/ImeSwitcher.java
index b8408d0f..8415759c 100644
--- a/src/java/KP2ASoftKeyboard2/java/src/keepass2android/kbbridge/ImeSwitcher.java
+++ b/src/java/KP2ASoftKeyboard2/java/src/keepass2android/kbbridge/ImeSwitcher.java
@@ -54,7 +54,12 @@ public class ImeSwitcher {
 				String currentIme = android.provider.Settings.Secure.getString(
                         ctx.getContentResolver(),
                         android.provider.Settings.Secure.DEFAULT_INPUT_METHOD);
-								
+				currentIme += ";"+String.valueOf(
+							android.provider.Settings.Secure.getInt(
+									ctx.getContentResolver(),
+									android.provider.Settings.Secure.SELECTED_INPUT_METHOD_SUBTYPE,
+									-1)
+								);
 				SharedPreferences prefs = ctx.getSharedPreferences(KP2A_SWITCHER, Context.MODE_PRIVATE);
 				Editor edit = prefs.edit();
 				
diff --git a/src/java/Keepass2AndroidPluginSDK/bin/keepass2androidpluginsdk.jar b/src/java/Keepass2AndroidPluginSDK/bin/keepass2androidpluginsdk.jar
index d2e80167..3a03c3c8 100644
Binary files a/src/java/Keepass2AndroidPluginSDK/bin/keepass2androidpluginsdk.jar and b/src/java/Keepass2AndroidPluginSDK/bin/keepass2androidpluginsdk.jar differ