Merge "Remove positional reference from createaccountmail"