toolbar reply refactoring: part 1