messenger and gravatar
Merge branch 'messenger'
recoveries with username