Merge pull request #568 from joltmode/master

Fixes message attached between top and bottom.
Fixes bottom attached message bottom margin.