Add missing file
The from field is not always set. In order to be sure to find current user, fallback on the Account information field