sync with sylpheed 0.6.1cvs2