diff --git a/Classes/ChatConversationView.m b/Classes/ChatConversationView.m
index f37ad3258..46bde52c5 100644
--- a/Classes/ChatConversationView.m
+++ b/Classes/ChatConversationView.m
@@ -196,7 +196,8 @@ static UICompositeViewDescription *compositeDescription = nil;
 	_vrInnerView.layer.masksToBounds = YES;
 	_vrWaveMaskPlayer.backgroundColor = [UIColor colorWithPatternImage:[UIImage imageNamed:@"color_L"]]; // rgba(1,88,7,0.2);
 	_showVoiceRecorderView = false;
-	
+	_toggleMenuButton.imageView.contentMode = UIViewContentModeScaleAspectFit;
+	_toggleRecord.imageView.contentMode = UIViewContentModeScaleAspectFit;
 }
 
 - (void)refreshData {
diff --git a/Classes/LinphoneUI/UIChatBubbleTextCell.m b/Classes/LinphoneUI/UIChatBubbleTextCell.m
index 0125bd904..ce09f8140 100644
--- a/Classes/LinphoneUI/UIChatBubbleTextCell.m
+++ b/Classes/LinphoneUI/UIChatBubbleTextCell.m
@@ -399,7 +399,7 @@ static const CGFloat REPLY_OR_FORWARD_TAG_HEIGHT  = 18;
 		return cached;
 	}
 	
-    CGSize size = [self ViewHeightForMessageText:chat withWidth:width textForImdn:nil];
+	CGSize size = [self ViewHeightForMessageText:chat withWidth:width textForImdn:nil];
 	size.height += linphone_chat_message_is_forward(chat) || linphone_chat_message_is_reply(chat) ? REPLY_OR_FORWARD_TAG_HEIGHT : 0;
 	size.height += linphone_chat_message_is_reply(chat) ? REPLY_CHAT_BUBBLE_HEIGHT+5 : 0;