Change from and to mail addresses to use container parameters instead of string constants