am caaeed38: Revert commits for old archive/delete dialog

* commit 'caaeed3837316175111bb16e6b60aeb0d523debf':
  Revert commits for old archive/delete dialog