MessageCell adjustment fixes