Merge "Fix uncommanded exit from MessageList with 2+ accounts" into froyo