merged attachments + body-parts together.
  More shuffling of things around.