fix remove attachment when not signing/encrypting