fix expunge, delete

fix also bug with content-type case.
workaround for nested attachs