diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java
index 10ae3f423..4b15354e8 100644
--- a/src/android/org/linphone/chat/GroupChatFragment.java
+++ b/src/android/org/linphone/chat/GroupChatFragment.java
@@ -426,6 +426,8 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
             if (contact != null) {
                 menu.removeItem(R.id.add_to_contacts);
             }
+        } else {
+            menu.removeItem(R.id.add_to_contacts);
         }
     }
 
diff --git a/src/android/org/linphone/chat/GroupInfoFragment.java b/src/android/org/linphone/chat/GroupInfoFragment.java
index b2da3a52d..1136042e3 100644
--- a/src/android/org/linphone/chat/GroupInfoFragment.java
+++ b/src/android/org/linphone/chat/GroupInfoFragment.java
@@ -263,14 +263,9 @@ public class GroupInfoFragment extends Fragment implements ChatRoomListener {
                     mWaitLayout.setVisibility(View.VISIBLE);
                     mTempChatRoom = LinphoneManager.getLc().createClientGroupChatRoom(mSubjectField.getText().toString(), false, mIsEncryptionEnabled);
                     mTempChatRoom.addListener(mChatRoomCreationListener);
-
-                    Address addresses[] = new Address[mParticipants.size()];
-                    int index = 0;
                     for (ContactAddress ca : mParticipants) {
-                        addresses[index] = ca.getAddress();
-                        index++;
+                        mTempChatRoom.addParticipant(ca.getAddress());
                     }
-                    mTempChatRoom.addParticipants(addresses);
                 } else {
                     // Subject
                     String newSubject = mSubjectField.getText().toString();
diff --git a/src/android/org/linphone/chat/ImdnFragment.java b/src/android/org/linphone/chat/ImdnFragment.java
index 273c7d3e2..4d9c66e5e 100644
--- a/src/android/org/linphone/chat/ImdnFragment.java
+++ b/src/android/org/linphone/chat/ImdnFragment.java
@@ -124,6 +124,7 @@ public class ImdnFragment extends Fragment {
                 refreshInfo();
             }
         };
+        if (mMessage == null) return null;
         mMessage.setListener(mListener);
 
         RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);