Added few patches from kopete