Use identity instead of account in MessageCompose, simplify account naming