when determining the sender, also take From field into account
make reply code slightly more readable