diff --git a/res/layout/history_detail.xml b/res/layout/history_detail.xml
index bc7c99fb2..a3791af11 100644
--- a/res/layout/history_detail.xml
+++ b/res/layout/history_detail.xml
@@ -39,7 +39,7 @@
                 android:contentDescription="@string/content_description_add_contact"
                 android:padding="15dp"
                 android:src="@drawable/contact_add"
-                android:visibility="gone"/>
+                android:visibility="invisible"/>
 
             <ImageView
                 android:id="@+id/goto_contact"
@@ -50,7 +50,7 @@
                 android:contentDescription="@string/content_description_contacts"
                 android:padding="15dp"
                 android:src="@drawable/contact"
-                android:visibility="gone"/>
+                android:visibility="invisible"/>
         </LinearLayout>
 
         <ScrollView
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 97ee0b7d0..f4a408303 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -218,6 +218,7 @@ Vos amis pourront vous joindre plus facilement si vous associez votre compte à
   <string name="no_current_call">Aucun appel en cours</string>
   <string name="couldnt_accept_call">Une erreur est survenue pendant l\'acceptation de l\'appel</string>
   <string name="zrtp_dialog1">Indiquez le code SAS suivant à votre interlocuteur:\nDites: %s</string>
+  <string name="zrtp_dialog2">\nVotre interlocuteur doit dire: %s</string>
   <string name="unknown_incoming_call_name">Inconnu</string>
   <string name="call_stats_audio">Audio</string>
   <string name="call_stats_video">Vidéo</string>
diff --git a/src/android/org/linphone/call/CallActivity.java b/src/android/org/linphone/call/CallActivity.java
index 95a9844fb..dba06c384 100644
--- a/src/android/org/linphone/call/CallActivity.java
+++ b/src/android/org/linphone/call/CallActivity.java
@@ -1250,7 +1250,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
 			refreshStatusItems(lc.getCurrentCall(), lc.getCurrentCall().getCurrentParams().videoEnabled());
 		}
 
-        if (lc != null) {
+        if (lc != null && getisZrtpAsk()) {
             showZRTPDialog(lc.getCurrentCall());
         }
 
diff --git a/src/android/org/linphone/chat/ChatEventsAdapter.java b/src/android/org/linphone/chat/ChatEventsAdapter.java
index 846b7f18b..e8f8c8865 100644
--- a/src/android/org/linphone/chat/ChatEventsAdapter.java
+++ b/src/android/org/linphone/chat/ChatEventsAdapter.java
@@ -84,14 +84,16 @@ public class ChatEventsAdapter extends ListSelectionAdapter {
 	private Bitmap mDefaultBitmap;
 	private GroupChatFragment mFragment;
 	private ChatMessageListenerStub mListener;
+	private boolean isOneToOne;
 
-    public ChatEventsAdapter(GroupChatFragment fragment, ListSelectionHelper helper, LayoutInflater inflater, EventLog[] history, ArrayList<LinphoneContact> participants) {
+    public ChatEventsAdapter(GroupChatFragment fragment, ListSelectionHelper helper, LayoutInflater inflater, EventLog[] history, ArrayList<LinphoneContact> participants, boolean oneToOne) {
 	    super(helper);
 	    mFragment = fragment;
 	    mContext = mFragment.getActivity();
         mLayoutInflater = inflater;
         mHistory = new ArrayList<>(Arrays.asList(history));
 	    mParticipants = participants;
+	    isOneToOne = oneToOne;
 
 	    mListener = new ChatMessageListenerStub() {
 		    @Override
@@ -394,7 +396,7 @@ public class ChatEventsAdapter extends ListSelectionAdapter {
 		    holder.messageDate.setVisibility(View.VISIBLE);
 
 		    holder.bubbleLayout.setLayoutParams(layoutParams);
-	    } else { // Event is not chat message
+	    } else if (!isOneToOne) { // Event is not chat message
 		    holder.eventLayout.setVisibility(View.VISIBLE);
 
 		    Address address = event.getParticipantAddress();
diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java
index 7e7b5d9a4..4a099673a 100644
--- a/src/android/org/linphone/chat/GroupChatFragment.java
+++ b/src/android/org/linphone/chat/GroupChatFragment.java
@@ -569,9 +569,9 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 	private void displayChatRoomHistory() {
 		if (mChatRoom == null) return;
 		if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) {
-			mEventsAdapter = new ChatEventsAdapter(this, mSelectionHelper, mInflater, mChatRoom.getHistoryMessageEvents(0), mParticipants);
+			mEventsAdapter = new ChatEventsAdapter(this, mSelectionHelper, mInflater, mChatRoom.getHistoryMessageEvents(0), mParticipants, true);
 		} else {
-			mEventsAdapter = new ChatEventsAdapter(this, mSelectionHelper, mInflater, mChatRoom.getHistoryEvents(0), mParticipants);
+			mEventsAdapter = new ChatEventsAdapter(this, mSelectionHelper, mInflater, mChatRoom.getHistoryEvents(0), mParticipants, false);
 		}
 		mSelectionHelper.setAdapter(mEventsAdapter);
 		mChatEventsList.setAdapter(mEventsAdapter);
diff --git a/submodules/oRTP b/submodules/oRTP
index 035ce38af..17be28e9d 160000
--- a/submodules/oRTP
+++ b/submodules/oRTP
@@ -1 +1 @@
-Subproject commit 035ce38af031fae040b2a32dcd7eb3f8698b8a42
+Subproject commit 17be28e9d0b8e50b89ff9fba75990a51f03f111e