merge with SYNC-B4-REL and sync with sylpheed 0.6.5cvs5