Merge "Divide a message text into correctly sized parts"
am: 8f7157ca48

Change-Id: Icdce9f88718d8e864f4ab1fc0a024d236ccb4eb7