Fixed incorrect layout and NullPointerException in message replys
Bumped version
Bumped version
Merge branch 'release/0.12.5' into develop