[BTB] mailform implementation - further fixes