Move settings into account dropdown
Don't separate subject and first message
Merge branch 'matts-refinements'
Fix invitation spec