imapx/
  upstream		master, 54c762ed100c03cef892ffa54af9334829ab838c
  libcamel1.2           (same as upstream)
