imapx/
  upstream		master, 891f5b4cf7a680135af907027ba82150cad777c8
  libcamel1.2           (same as upstream)
