add userid to messageid
add unit test for userid in messageid
Cleaned up some documentation in email
Merge branch 'messageId'

* messageId:
  Cleaned up some documentation in email
  add unit test for userid in messageid
  add userid to messageid