Borrowed Ashley's changes to mymessages so tests pass.