imapx/
  upstream		master, 7efd1e7969c70fb497febd455591041994bbf90b
  libcamel1.2           (same as upstream)
