merged gtk2_imap_c branch with HEAD