toolbar reply refactoring: part 2