Fix pulled in for closeMIMEEntities from Roland's branch