diff --git a/Classes/LinphoneUI/UIChatBubblePhotoCell.m b/Classes/LinphoneUI/UIChatBubblePhotoCell.m
index be20a46a6..820a47b0c 100644
--- a/Classes/LinphoneUI/UIChatBubblePhotoCell.m
+++ b/Classes/LinphoneUI/UIChatBubblePhotoCell.m
@@ -44,6 +44,7 @@ static UIFont *CELL_FONT = nil;
 	if ((self = [super initWithStyle:UITableViewCellStyleDefault reuseIdentifier:identifier]) != nil) {
 		[[NSBundle mainBundle] loadNibNamed:NSStringFromClass(self.class) owner:self options:nil];
 
+#if 0
 		// shift message box, otherwise it will collide with the bubble
 		CGRect messageCoords = _messageText.frame;
 		messageCoords.origin.x += 2;
@@ -52,19 +53,14 @@ static UIFont *CELL_FONT = nil;
 
 		_messageText.frame = messageCoords;
 		_messageText.allowSelectAll = TRUE;
+#endif
 	}
 
 	return self;
 }
 
 - (void)dealloc {
-	[self disconnectFromFileDelegate];
-	if (message) {
-		linphone_chat_message_set_user_data(message, NULL);
-		linphone_chat_message_cbs_set_msg_state_changed(linphone_chat_message_get_callbacks(message), NULL);
-		linphone_chat_message_unref(message);
-		message = NULL;
-	}
+	[self setChatMessage:NULL];
 }
 
 #pragma mark -
diff --git a/Classes/PhoneMainView.h b/Classes/PhoneMainView.h
index 42d8a62fb..0a8fc38dd 100644
--- a/Classes/PhoneMainView.h
+++ b/Classes/PhoneMainView.h
@@ -44,6 +44,12 @@
 #import "DTActionSheet.h"
 #import "Utils.h"
 
+#define DYNAMIC_CAST(x, cls)                                                                                           \
+	({                                                                                                                 \
+		cls *inst_ = (cls *)(x);                                                                                       \
+		[inst_ isKindOfClass:[cls class]] ? inst_ : nil;                                                               \
+	})
+
 #define VIEW(x)                                                                                                        \
 	DYNAMIC_CAST([PhoneMainView.instance.mainViewController getCachedController:x.compositeViewDescription.content], x)
 
diff --git a/Classes/Utils/Utils.h b/Classes/Utils/Utils.h
index b092ca82a..cdf490568 100644
--- a/Classes/Utils/Utils.h
+++ b/Classes/Utils/Utils.h
@@ -17,12 +17,6 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#define DYNAMIC_CAST(x, cls)                        \
- ({                                                 \
-    cls *inst_ = (cls *)(x);                        \
-    [inst_ isKindOfClass:[cls class]]? inst_ : nil; \
- })
-
 #import "LinphoneManager.h"
 
 @interface LinphoneLogger : NSObject {
diff --git a/submodules/linphone b/submodules/linphone
index 352b9c840..d1907a0d4 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 352b9c84067692131b2c58ad8d2d62a37b664e9e
+Subproject commit d1907a0d4879cf57e3a4d967ddafc82abe9d39db