Merge "Revert "Use eval command to append mail options""