diff --git a/TMessagesProj/jni/mr_wrapper.c b/TMessagesProj/jni/mr_wrapper.c
index 640f2118d..63fb19269 100644
--- a/TMessagesProj/jni/mr_wrapper.c
+++ b/TMessagesProj/jni/mr_wrapper.c
@@ -2,7 +2,7 @@
 #include <jni.h>
 
 
-JNIEXPORT int Java_org_telegram_messenger_MrMailbox_myJnixTest(JNIEnv *env, jclass class)
+JNIEXPORT int Java_org_telegram_messenger_MrMailbox_MrMailboxNew(JNIEnv *env, jclass class)
 {
-	return 24;
+	return 28;
 }
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java b/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java
index 11f4b1648..3ca9a80a7 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java
@@ -4,5 +4,20 @@ package org.telegram.messenger;
  * Created by bpetersen on 14.09.16.
  */
 public class MrMailbox {
-    public native static int myJnixTest();
+
+    // work with mailboxes
+    public native static int     MrMailboxNew         (); // returns hMailbox (Names as mrmailbox_new don't work due to the additional underscore)
+    public native static void    MrMailboxDelete      (int hMailbox);
+    public native static int     MrMailboxOpen        (int hMailbox, String dbfile);
+    public native static void    MrMailboxClose       (int hMailbox);
+    public native static int     MrMailboxGetChats    (int hMailbox); // returns hChatlist
+
+    // working with chatlists
+    public native static int     MrChatlistGetCnt     (int hChatlist);
+    public native static int     MrChatlistGetChat    (int hChatlist, int index); // returns hChat
+
+    // working with chats
+    public native static int     MrChatGetId          (int hChat);
+    public native static int     MrChatGetType        (int hChat);
+    public native static String  MrChatCetName        (int hChat);
 }
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java
index 462ca69f1..f88f79870 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java
@@ -1328,7 +1328,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
                         PackageInfo pInfo = ApplicationLoader.applicationContext.getPackageManager().getPackageInfo(ApplicationLoader.applicationContext.getPackageName(), 0);
                         int code = pInfo.versionCode / 10;
                         String abi = "";
-                        int testval = MrMailbox.myJnixTest();
+                        int testval = MrMailbox.MrMailboxNew();
                         switch (pInfo.versionCode % 10) {
                             case 0:
                                 abi = "arm";