[BTB] mailform implementation - further fixes
[BTB] mailform implementation - further fixes