am 84d16804: Merge "Add a confirmation dialog to empty trash/spam." into jb-ub-mail-ur9

* commit '84d168042a95cafe6da6874a81603e3bd83368ae':
  Add a confirmation dialog to empty trash/spam.