FROM and FROM_NAME settings added