diff --git a/.gitignore b/.gitignore
index f1ed51c97..5a8923c0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,6 +48,9 @@ WORK
 .d
 google-services.json
 .*clang*
-linphone.iml
+**/*.iml
 src/linphone-wrapper
 liblinphone_tester/res/raw/
+**/.classpath
+**/.project
+**/*.kdev4
diff --git a/gradle.properties b/gradle.properties
index a4996c82d..a1e7a7cb6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,4 +4,4 @@ RELEASE_STORE_PASSWORD=
 RELEASE_KEY_ALIAS=
 RELEASE_KEY_PASSWORD=
 #source:https://docs.gradle.org/current/userguide/build_environment.html#sec:configuring_jvm_memory
-org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
diff --git a/liblinphone-sdk/build.gradle b/liblinphone-sdk/build.gradle
index e222f8e48..420188d92 100644
--- a/liblinphone-sdk/build.gradle
+++ b/liblinphone-sdk/build.gradle
@@ -113,6 +113,7 @@ android {
             assets.srcDirs = ["${buildDir}/sdk-assets/assets/"]
             renderscript.srcDirs = srcDir
             jniLibs.srcDirs = ['../libs']
+            resources.srcDir("res")
 
             java.excludes = ['**/mediastream/MediastreamerActivity.java']
 
diff --git a/prepare.py b/prepare.py
index f29602f74..0b954b293 100755
--- a/prepare.py
+++ b/prepare.py
@@ -268,7 +268,8 @@ copy-libs:
 \t\tcp -f liblinphone-sdk/android-arm/bin/gdb.setup libs/armeabi; \\
 \tfi
 \tif test -f "liblinphone-sdk/android-arm/lib/wrap.sh"; then \\
-\t\tcp -f liblinphone-sdk/android-arm/lib/wrap.sh libs/armeabi; \\
+\t\tmkdir -p liblinphone-sdk/res/lib/armeabi && \\
+\t\tcp -f liblinphone-sdk/android-arm/lib/wrap.sh liblinphone-sdk/res/lib/armeabi; \\
 \tfi
 \trm -rf libs-debug/armeabi-v7a
 \trm -rf libs/armeabi-v7a
@@ -288,7 +289,8 @@ copy-libs:
 \t\tcp -f liblinphone-sdk/android-armv7/bin/gdb.setup libs/armeabi-v7a; \\
 \tfi
 \tif test -f "liblinphone-sdk/android-armv7/lib/wrap.sh"; then \\
-\t\tcp -f liblinphone-sdk/android-armv7/lib/wrap.sh libs/armeabi-v7a; \\
+\t\tmkdir -p liblinphone-sdk/res/lib/armeabi-v7a && \\
+\t\tcp -f liblinphone-sdk/android-armv7/lib/wrap.sh liblinphone-sdk/res/lib/armeabi-v7a; \\
 \tfi
 \trm -rf libs-debug/arm64-v8a
 \trm -rf libs/arm64-v8a
@@ -308,7 +310,8 @@ copy-libs:
 \t\tcp -f liblinphone-sdk/android-arm64/bin/gdb.setup libs/arm64-v8a; \\
 \tfi
 \tif test -f "liblinphone-sdk/android-arm64/lib/wrap.sh"; then \\
-\t\tcp -f liblinphone-sdk/android-arm64/lib/wrap.sh libs/arm64-v8a; \\
+\t\tmkdir -p liblinphone-sdk/res/lib/arm64-v8a && \\
+\t\tcp -f liblinphone-sdk/android-arm64/lib/wrap.sh liblinphone-sdk/res/lib/arm64-v8a; \\
 \tfi
 \trm -rf libs-debug/x86
 \trm -rf libs/x86
@@ -328,7 +331,8 @@ copy-libs:
 \t\tcp -f liblinphone-sdk/android-x86/bin/gdb.setup libs/x86; \\
 \tfi
 \tif test -f "liblinphone-sdk/android-x86/lib/wrap.sh"; then \\
-\t\tcp -f liblinphone-sdk/android-x86/lib/wrap.sh libs/x86; \\
+\t\tmkdir -p liblinphone-sdk/res/lib/x86 && \\
+\t\tcp -f liblinphone-sdk/android-x86/lib/wrap.sh liblinphone-sdk/res/lib/x86; \\
 \tfi
 
 copy-libs-mediastreamer:
diff --git a/src/android/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java
index 6cbd92156..b6af9eb4c 100644
--- a/src/android/org/linphone/LinphoneManager.java
+++ b/src/android/org/linphone/LinphoneManager.java
@@ -2,7 +2,7 @@ package org.linphone;
 
 /*
 LinphoneManager.java
-Copyright (C) 2017  Belledonne Communications, Grenoble, France
+Copyright (C) 2018  Belledonne Communications, Grenoble, France
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java
index 62c598eaf..7685c1cb4 100644
--- a/src/android/org/linphone/chat/GroupChatFragment.java
+++ b/src/android/org/linphone/chat/GroupChatFragment.java
@@ -387,28 +387,29 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 		ChatMessage message = event.getChatMessage();
 		String messageId = message.getMessageId();
 
-		switch(item.getItemId()) {
-			case R.id.resend:
-				mEventsAdapter.removeItem(info.position);
-				message.resend();
-				return true;
-			case R.id.imdn_infos:
-				LinphoneActivity.instance().goToChatMessageImdnInfos(getRemoteSipUri(), messageId);
-				return true;
-			case R.id.copy_text:
-				if (message.hasTextContent()) {
-					ClipboardManager clipboard = (ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
-					ClipData clip = ClipData.newPlainText("Message", message.getTextContent());
-					clipboard.setPrimaryClip(clip);
-				}
-				return true;
-			case R.id.delete_message:
-				mChatRoom.deleteMessage(message);
-				mEventsAdapter.removeItem(info.position);
-				return true;
-			default:
-				return super.onContextItemSelected(item);
+		if (item.getItemId() == R.id.resend) {
+			mEventsAdapter.removeItem(info.position);
+			message.resend();
+			return true;
 		}
+		if (item.getItemId() == R.id.imdn_infos) {
+			LinphoneActivity.instance().goToChatMessageImdnInfos(getRemoteSipUri(), messageId);
+			return true;
+		}
+		if (item.getItemId() == R.id.copy_text) {
+			if (message.hasTextContent()) {
+				ClipboardManager clipboard = (ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
+				ClipData clip = ClipData.newPlainText("Message", message.getTextContent());
+				clipboard.setPrimaryClip(clip);
+			}
+			return true;
+		}
+		if (item.getItemId() == R.id.delete_message) {
+			mChatRoom.deleteMessage(message);
+			mEventsAdapter.removeItem(info.position);
+			return true;
+		}
+		return super.onContextItemSelected(item);
 	}
 
 	/**