Better handling for sent to admin/plain text args Closes #4359