diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java
index 39377131a..8ef341230 100644
--- a/src/org/linphone/ChatFragment.java
+++ b/src/org/linphone/ChatFragment.java
@@ -571,7 +571,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 				mHandler.post(new Runnable() {
 					@Override
 					public void run() {
-						displayMessage(id, message.getText(), String.valueOf(System.currentTimeMillis()), true, null, messagesLayout);
+						displayMessage(id, message.getText(), String.valueOf(message.getTime()), true, null, messagesLayout);
 					}
 				});
 			} else if (message.getExternalBodyUrl() != null) {
@@ -580,7 +580,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 				mHandler.post(new Runnable() {
 					@Override
 					public void run() {
-						displayImageMessage(id, bm, String.valueOf(System.currentTimeMillis()), true, null, messagesLayout);
+						displayImageMessage(id, bm, String.valueOf(message.getTime()), true, null, messagesLayout);
 					}
 				});
 			}
diff --git a/submodules/linphone b/submodules/linphone
index 0fa5d7c73..0dadf758c 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 0fa5d7c73b672772a8841c65ff0c7fcdc4e1fce7
+Subproject commit 0dadf758c3bcd5ca26011cc2eee63a9abaa3e7fc