[HB] Simplify MarkAttachmentType handling
drwxr-xr-x - src