position message checkboxes
fix bad merge
Merge pull request #10 from peterschuelke/3.x_OA-645

3.x oa 645