Fixed to display the "from" field correctly