Fixed reply box display
Merge branch 'dev'