diff --git a/mail/evolution-plugin-rss/Makefile b/mail/evolution-plugin-rss/Makefile
index e1443d4e1bb..8907429dec8 100644
--- a/mail/evolution-plugin-rss/Makefile
+++ b/mail/evolution-plugin-rss/Makefile
@@ -1,16 +1,16 @@
-# $OpenBSD: Makefile,v 1.19 2010/04/27 08:11:23 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.20 2010/09/30 16:13:32 ajacoutot Exp $
 
 SHARED_ONLY=		Yes
 
 COMMENT=		RSS-reader plugin for GNOME
 
 GNOME_PROJECT=		evolution-rss
-GNOME_VERSION=		0.1.4.99 # Debian evolution-rss_0.1.9~20100320
-PKGNAME=		evolution-plugin-rss-${GNOME_VERSION}p0
+GNOME_VERSION=		0.2.0
+PKGNAME=		evolution-plugin-rss-${GNOME_VERSION}
 
 CATEGORIES=		mail
 
-EVO_VERSION=		2.30
+EVO_VERSION=		2.32
 SUBST_VARS=		EVO_VERSION
 
 HOMEPAGE=		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
@@ -24,18 +24,12 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB += ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
-WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo dbus-1
-WANTLIB += dbus-glib-1 enchant expat fontconfig freetype gailutil
-WANTLIB += gcrypt gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += glitz gmodule-2.0 gnome-keyring gnutls gobject-2.0
-WANTLIB += gpg-error gthread-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pcre pixman-1 png proxy pthread pthread-stubs
-WANTLIB += soup-2.4 sqlite3 stdc++ tasn1 xcb xml2 z
-WANTLIB += eggdbus-1 xcb-render xcb-render-util
+WANTLIB += ORBit-2 c dbus-1 dbus-glib-1 gcrypt gio-2.0 glib-2.0
+WANTLIB += gmodule-2.0 gnome-keyring gnutls gobject-2.0 gpg-error
+WANTLIB += gthread-2.0 m pcre proxy pthread soup-2.4 soup-gnome-2.4
+WANTLIB += sqlite3 stdc++ tasn1 xml2 z
 
-#MASTER_SITES=		http://gnome.eu.org/
-MASTER_SITES=		http://crappydiffs.org/
+MASTER_SITES=		http://gnome.eu.org/
 EXTRACT_SUFX=		.tar.gz
 
 MODULES=		devel/gettext \
@@ -43,9 +37,8 @@ MODULES=		devel/gettext \
 			devel/gconf2
 
 BUILD_DEPENDS=		${RUN_DEPENDS}
-RUN_DEPENDS=		:evolution->=2.24.1.1:mail/evolution
-LIB_DEPENDS=		gtkhtml-3.14.>=3,gtkhtml-editor::www/gtkhtml3 \
-			soup-gnome-2.4.>=1::devel/libsoup,-gnome
+RUN_DEPENDS=		:evolution->=2.32.0:mail/evolution
+LIB_DEPENDS=		::devel/libsoup,-gnome
 
 USE_X11=		Yes
 
diff --git a/mail/evolution-plugin-rss/distinfo b/mail/evolution-plugin-rss/distinfo
index 1e5abe6b7c1..563f30cde14 100644
--- a/mail/evolution-plugin-rss/distinfo
+++ b/mail/evolution-plugin-rss/distinfo
@@ -1,5 +1,5 @@
-MD5 (evolution-rss-0.1.4.99.tar.gz) = nJw4yJZWmMxjvU/vhB06Tw==
-RMD160 (evolution-rss-0.1.4.99.tar.gz) = q2EdP3Wn4oXseQSPztyNx5E8e44=
-SHA1 (evolution-rss-0.1.4.99.tar.gz) = PF66wMFqh+SYSIe8ijihnqZ/UGY=
-SHA256 (evolution-rss-0.1.4.99.tar.gz) = bMlWyeoTgb3P5JTgjVA8iLEpPffbdIHfsvamIvoUOQc=
-SIZE (evolution-rss-0.1.4.99.tar.gz) = 694183
+MD5 (evolution-rss-0.2.0.tar.gz) = jVuhzOUIHcd35pqDaVp5Yg==
+RMD160 (evolution-rss-0.2.0.tar.gz) = O9Dq8bA614tAf5BQzGqY41xogq0=
+SHA1 (evolution-rss-0.2.0.tar.gz) = ii7crMdJgyLpGBbg6uc2oR2LC00=
+SHA256 (evolution-rss-0.2.0.tar.gz) = H4ppDpclulwJzla1m+6kyRygAI+We3cPJBXCXlEsPr8=
+SIZE (evolution-rss-0.2.0.tar.gz) = 662994
diff --git a/mail/evolution-plugin-rss/patches/patch-configure b/mail/evolution-plugin-rss/patches/patch-configure
index 4f0e2542048..3b213ca0f0d 100644
--- a/mail/evolution-plugin-rss/patches/patch-configure
+++ b/mail/evolution-plugin-rss/patches/patch-configure
@@ -1,7 +1,27 @@
-$OpenBSD: patch-configure,v 1.5 2010/04/23 10:56:54 jasper Exp $
---- configure.orig	Fri Apr 23 12:45:42 2010
-+++ configure	Fri Apr 23 12:46:13 2010
-@@ -16445,11 +16445,8 @@ if test -n "$EVOLUTION_VERSION"; then
+$OpenBSD: patch-configure,v 1.6 2010/09/30 16:13:32 ajacoutot Exp $
+
+XXX make it compile with gtk+2 2.22 (*_DISABLE_DEPRECATED)
+XXX make it compile with newer e-d-s (-Werror-implicit-function-declaration)
+
+--- configure.orig	Wed Jul 21 06:57:38 2010
++++ configure	Thu Sep 30 17:40:56 2010
+@@ -4250,7 +4250,6 @@ fi
+ 	-DPANGO_DISABLE_DEPRECATED
+ 	-DGDK_PIXBUF_DISABLE_DEPRECATED
+ 	-DGDK_DISABLE_DEPRECATED
+-	-DGTK_DISABLE_DEPRECATED
+ 	-DG_DISABLE_SINGLE_INCLUDES
+ 	-DGTK_DISABLE_SINGLE_INCLUDES
+ 	-Wall -Wextra
+@@ -4258,7 +4257,6 @@ fi
+ 	-Wno-sign-compare
+ 	-Wno-unused-parameter
+ 	-Wdeclaration-after-statement
+-	-Werror-implicit-function-declaration
+ 	-Wformat-security -Winit-self
+ 	-Wmissing-declarations -Wmissing-include-dirs
+ 	-Wmissing-noreturn -Wnested-externs -Wpointer-arith
+@@ -16428,11 +16426,8 @@ if test -n "$EVOLUTION_VERSION"; then
          EVOLUTION_BASE_VERSION=$EVOLUTION_VERSION
          EVOLUTION_BASE_VERSION_S=""
          EVOLUTION_EXEC_VERSION=`$PKG_CONFIG --variable=execversion evolution-shell 2>/dev/null`
diff --git a/mail/evolution-plugin-rss/patches/patch-src_Makefile_in b/mail/evolution-plugin-rss/patches/patch-src_Makefile_in
new file mode 100644
index 00000000000..3430b8f7f6b
--- /dev/null
+++ b/mail/evolution-plugin-rss/patches/patch-src_Makefile_in
@@ -0,0 +1,19 @@
+$OpenBSD: patch-src_Makefile_in,v 1.6 2010/09/30 16:13:32 ajacoutot Exp $
+--- src/Makefile.in.orig	Thu Sep 30 17:43:10 2010
++++ src/Makefile.in	Thu Sep 30 17:43:42 2010
+@@ -1017,11 +1017,11 @@ uninstall-am: uninstall-binPROGRAMS uninstall-errorDAT
+ 	$< > $@
+ %.schemas.in: %.schemas.in.in
+ 	sed -e "s#\@bindir\@#@bindir@#g" $< > $@
+-@HAVE_BONOBO_TRUE@	sed -i -e 's!^src\/GNOME_Evolution_RSS.server.in.in!!g' $(top_srcdir)/po/POTFILES.skip
+-@HAVE_BONOBO_TRUE@	sed -i -e 's!^#src\/GNOME_Evolution_RSS.server.in.in!!g' $(top_srcdir)/po/POTFILES.in
++@HAVE_BONOBO_TRUE@	perl -p -i -e 's!^src\/GNOME_Evolution_RSS.server.in.in!!g' $(top_srcdir)/po/POTFILES.skip
++@HAVE_BONOBO_TRUE@	perl -p -i -e 's!^#src\/GNOME_Evolution_RSS.server.in.in!!g' $(top_srcdir)/po/POTFILES.in
+ @HAVE_BONOBO_TRUE@	echo 'src/GNOME_Evolution_RSS.server.in.in' >> $(top_srcdir)/po/POTFILES.in
+-@HAVE_BONOBO_FALSE@	sed -i -e 's!^#src\/GNOME_Evolution_RSS.server.in.in!!g' $(top_srcdir)/po/POTFILES.in
+-@HAVE_BONOBO_FALSE@	sed -i -e 's!^src\/GNOME_Evolution_RSS.server.in.in!!g' $(top_srcdir)/po/POTFILES.in
++@HAVE_BONOBO_FALSE@	perl -p -i -e 's!^#src\/GNOME_Evolution_RSS.server.in.in!!g' $(top_srcdir)/po/POTFILES.in
++@HAVE_BONOBO_FALSE@	perl -p -i -e 's!^src\/GNOME_Evolution_RSS.server.in.in!!g' $(top_srcdir)/po/POTFILES.in
+ @HAVE_BONOBO_FALSE@	echo 'src/GNOME_Evolution_RSS.server.in.in' >> $(top_srcdir)/po/POTFILES.skip
+ 
+ @EVO_SERVER_RULE@
diff --git a/mail/evolution-plugin-rss/patches/patch-src_rss-config-factory_c b/mail/evolution-plugin-rss/patches/patch-src_rss-config-factory_c
new file mode 100644
index 00000000000..bc06f6b98fa
--- /dev/null
+++ b/mail/evolution-plugin-rss/patches/patch-src_rss-config-factory_c
@@ -0,0 +1,101 @@
+$OpenBSD: patch-src_rss-config-factory_c,v 1.3 2010/09/30 16:13:32 ajacoutot Exp $
+
+From 37ebcebeae4e85024ef6689266a611841b58da2e Mon Sep 17 00:00:00 2001
+From: Lucian Langa <lucilanga@gnome.org>
+Date: Fri, 09 Jul 2010 14:38:06 +0000
+Subject: adapt to GError camel modifications
+
+--- src/rss-config-factory.c.orig	Tue Jul 20 22:32:03 2010
++++ src/rss-config-factory.c	Thu Sep 30 17:20:07 2010
+@@ -976,7 +976,7 @@ destroy_delete(GtkWidget *selector, gpointer user_data
+ //this function resembles emfu_delete_rec in mail/em-folder-utils.c
+ //which is not exported ?
+ static void
+-rss_delete_rec (CamelStore *store, CamelFolderInfo *fi, CamelException *ex)
++rss_delete_rec (CamelStore *store, CamelFolderInfo *fi, GError **error)
+ {
+ 	int i;
+ 	GPtrArray *uids;
+@@ -986,7 +986,7 @@ rss_delete_rec (CamelStore *store, CamelFolderInfo *fi
+ 
+ 		d("deleting folder '%s'\n", fi->full_name);
+ 
+-		if (!(folder = camel_store_get_folder (store, fi->full_name, 0, ex)))
++		if (!(folder = camel_store_get_folder (store, fi->full_name, 0, error)))
+ 			return;
+ 
+ 			uids = camel_folder_get_uids (folder);
+@@ -1004,8 +1004,8 @@ rss_delete_rec (CamelStore *store, CamelFolderInfo *fi
+ 
+ 		d("do camel_store_delete_folder()\n");
+ 
+-		camel_store_delete_folder (store, fi->full_name, ex);
+-		if (camel_exception_is_set (ex))
++		camel_store_delete_folder (store, fi->full_name, error);
++		if (error != NULL)
+ 			return;
+ 
+ 		fi = fi->next;
+@@ -1013,8 +1013,9 @@ rss_delete_rec (CamelStore *store, CamelFolderInfo *fi
+ }
+ 
+ void
+-rss_delete_folders (
+-	CamelStore *store, const char *full_name, CamelException *ex)
++rss_delete_folders (CamelStore *store,
++		const char *full_name,
++		GError **error)
+ {
+ 	guint32 flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE
+ 		| CAMEL_STORE_FOLDER_INFO_FAST
+@@ -1025,12 +1026,12 @@ rss_delete_folders (
+ 	fi = camel_store_get_folder_info (
+ 		store,
+ 		full_name,
+-		flags, ex);
+-	if (!fi || camel_exception_is_set (ex))
++		flags, error);
++	if (!fi || error != NULL)
+ 		return;
+ 
+ 	d("call rss_delete_rec()\n");
+-	rss_delete_rec (store, fi, ex);
++	rss_delete_rec (store, fi, error);
+ 	camel_store_free_folder_info (store, fi);
+ }
+ 
+@@ -1407,7 +1408,7 @@ process_dialog_edit(add_feed *feed, gchar *url, gchar 
+ 	gpointer key = lookup_key(feed_name);
+ 	gchar *prefix = NULL;
+ 	hrfeed *saved_feed;
+-	CamelException ex;
++	GError *error = NULL;
+ 	CamelStore *store = rss_component_peek_local_store();
+ 	GtkWidget *msg_feeds, *progress;
+ 
+@@ -1516,21 +1517,13 @@ process_dialog_edit(add_feed *feed, gchar *url, gchar 
+ 				gchar *b = g_build_path(
+ 						G_DIR_SEPARATOR_S,
+ 						dir, feed->feed_name, NULL);
+-				camel_exception_init (&ex);
+-				camel_store_rename_folder (store, a, b, &ex);
+-				if (camel_exception_is_set (&ex)) {
+-#if EVOLUTION_VERSION < 22904
+-					e_error_run(GTK_WINDOW(
+-						rf->preferences),
+-						"mail:no-rename-folder",
+-						a, b, ex.desc, NULL);
+-#else
++				camel_store_rename_folder (store, a, b, &error);
++				if (error != NULL) {
+ 					e_alert_run_dialog_for_args(
+ 						GTK_WINDOW(rf->preferences),
+ 						"mail:no-rename-folder",
+-						a, b, ex.desc, NULL);
+-#endif
+-					camel_exception_clear (&ex);
++						a, b, error->message, NULL);
++					g_clear_error(&error);
+ 				}
+ 				g_free(dir);
+ 				g_free(b);
diff --git a/mail/evolution-plugin-rss/patches/patch-src_rss-config-factory_h b/mail/evolution-plugin-rss/patches/patch-src_rss-config-factory_h
new file mode 100644
index 00000000000..5aed2a6c75c
--- /dev/null
+++ b/mail/evolution-plugin-rss/patches/patch-src_rss-config-factory_h
@@ -0,0 +1,18 @@
+$OpenBSD: patch-src_rss-config-factory_h,v 1.1 2010/09/30 16:13:32 ajacoutot Exp $
+
+From 37ebcebeae4e85024ef6689266a611841b58da2e Mon Sep 17 00:00:00 2001
+From: Lucian Langa <lucilanga@gnome.org>
+Date: Fri, 09 Jul 2010 14:38:06 +0000
+Subject: adapt to GError camel modifications
+
+--- src/rss-config-factory.h.orig	Tue Jul 20 22:32:03 2010
++++ src/rss-config-factory.h	Thu Sep 30 17:20:07 2010
+@@ -33,7 +33,7 @@ void delete_feed_folder_alloc(gchar *old_name);
+ void rss_delete_folders (
+ 	CamelStore *store,
+ 	const char *full_name,
+-	CamelException *ex);
++	GError **error);
+ 
+ void remove_feed_hash(gpointer name);
+ void init_rss_prefs(void);
diff --git a/mail/evolution-plugin-rss/patches/patch-src_rss-image_c b/mail/evolution-plugin-rss/patches/patch-src_rss-image_c
new file mode 100644
index 00000000000..77b3bbc49ff
--- /dev/null
+++ b/mail/evolution-plugin-rss/patches/patch-src_rss-image_c
@@ -0,0 +1,68 @@
+$OpenBSD: patch-src_rss-image_c,v 1.1 2010/09/30 16:13:32 ajacoutot Exp $
+
+From 37ebcebeae4e85024ef6689266a611841b58da2e Mon Sep 17 00:00:00 2001
+From: Lucian Langa <lucilanga@gnome.org>
+Date: Fri, 09 Jul 2010 14:38:06 +0000
+Subject: adapt to GError camel modifications
+
+--- src/rss-image.c.orig	Tue Jul 20 22:32:03 2010
++++ src/rss-image.c	Thu Sep 30 17:20:07 2010
+@@ -84,7 +84,7 @@ update_feed_image(RDF *r)
+ 	if (!g_file_test(feed_file, G_FILE_TEST_EXISTS)) {
+ 	if (image) {		//we need to validate image here with load_pixbuf
+ 		CamelStream *feed_fs = camel_stream_fs_new_with_name(feed_file,
+-			O_RDWR|O_CREAT, 0666);
++			O_RDWR|O_CREAT, 0666, NULL);
+ 		dup_auth_data(r->uri, image);
+ 		fi->feed_fs = feed_fs;
+ 		fi->key = g_strdup(key);
+@@ -313,9 +313,10 @@ finish_image (SoupSession *soup_sess, SoupMessage *msg
+ 		if (msg->response_body->data) {
+ 			camel_stream_write(user_data,
+ 				msg->response_body->data,
+-				msg->response_body->length);
++				msg->response_body->length,
++				NULL);
+ #endif
+-			camel_stream_close(user_data);
++			camel_stream_close(user_data, NULL);
+ #if (DATASERVER_VERSION >= 2031001)
+ 			g_object_unref(user_data);
+ #else
+@@ -323,8 +324,8 @@ finish_image (SoupSession *soup_sess, SoupMessage *msg
+ #endif
+ 		}
+ 	} else {
+-		camel_stream_write(user_data, pixfilebuf, pixfilelen);
+-		camel_stream_close(user_data);
++		camel_stream_write(user_data, pixfilebuf, pixfilelen, NULL);
++		camel_stream_close(user_data, NULL);
+ #if (DATASERVER_VERSION >= 2031001)
+ 		g_object_unref(user_data);
+ #else
+@@ -340,10 +341,12 @@ finish_create_icon (SoupMessage *msg, FEED_IMAGE *user
+ finish_create_icon (SoupSession *soup_sess, SoupMessage *msg, FEED_IMAGE *user_data)
+ #endif
+ {
+-	d("finish_image(): status:%d, user_data:%s\n", msg->status_code, user_data->img_file);
++	d("finish_image(): status:%d, user_data:%s\n",
++		msg->status_code, user_data->img_file);
+ 	if (404 != msg->status_code) {
+-		CamelStream *feed_fs = camel_stream_fs_new_with_name(user_data->img_file,
+-			O_RDWR|O_CREAT, 0666);
++		CamelStream *feed_fs = camel_stream_fs_new_with_name(
++					user_data->img_file,
++					O_RDWR|O_CREAT, 0666, NULL);
+ 		finish_image(soup_sess, msg, feed_fs);
+ #if (EVOLUTION_VERSION >= 22703)
+ 		display_folder_icon(evolution_store, user_data->key);
+@@ -468,6 +471,9 @@ decode_image_cache_filename(gchar *name)
+ }
+ 
+ gboolean image_is_valid(gchar *image);
++
++gboolean
++file_is_image(gchar *image);
+ 
+ gboolean
+ file_is_image(gchar *image)
diff --git a/mail/evolution-plugin-rss/patches/patch-src_rss_c b/mail/evolution-plugin-rss/patches/patch-src_rss_c
new file mode 100644
index 00000000000..dbdd033bd37
--- /dev/null
+++ b/mail/evolution-plugin-rss/patches/patch-src_rss_c
@@ -0,0 +1,183 @@
+$OpenBSD: patch-src_rss_c,v 1.5 2010/09/30 16:13:32 ajacoutot Exp $
+
+From 37ebcebeae4e85024ef6689266a611841b58da2e Mon Sep 17 00:00:00 2001
+From: Lucian Langa <lucilanga@gnome.org>
+Date: Fri, 09 Jul 2010 14:38:06 +0000
+Subject: adapt to GError camel modifications
+
+--- src/rss.c.orig	Tue Jul 20 22:32:03 2010
++++ src/rss.c	Thu Sep 30 17:20:07 2010
+@@ -492,7 +492,7 @@ browser_stream_write(CamelStream *stream, gchar *base)
+ 	GString *str = g_string_new(NULL);
+ 	gchar *line;
+ 	CamelStream *in = camel_stream_buffer_new(stream, CAMEL_STREAM_BUFFER_READ);
+-	while ((line = camel_stream_buffer_read_line((CamelStreamBuffer *)in))) {
++	while ((line = camel_stream_buffer_read_line((CamelStreamBuffer *)in, NULL))) {
+ 		gchar *tmp = line;
+ 		g_string_append(str, line);
+ 		g_free(tmp);
+@@ -1101,7 +1101,7 @@ rss_browser_update_content (
+ 						d("cache read\n");
+ 						fi->create = 0;
+ 						browser_stream_write(stream, po->website);
+-						camel_stream_close(stream);
++						camel_stream_close(stream, NULL);
+ #if (DATASERVER_VERSION >= 2031001)
+ 						g_object_unref(stream);
+ #else
+@@ -1149,13 +1149,16 @@ webkit_set_preferences(void)
+ 	g_object_set (settings, "enable-page-cache", TRUE, NULL);
+ 	//g_object_set (settings, "auto-resize-window", TRUE, NULL);
+ 	g_object_set (settings, "enable-plugins",
+-		gconf_client_get_bool(rss_gconf, GCONF_KEY_EMBED_PLUGIN, NULL),
++		gconf_client_get_bool(rss_gconf,
++			GCONF_KEY_EMBED_PLUGIN, NULL),
+ 		NULL);
+ 	g_object_set (settings, "enable-java-applet",
+-		gconf_client_get_bool(rss_gconf, GCONF_KEY_HTML_JAVA, NULL),
++		gconf_client_get_bool(rss_gconf,
++			GCONF_KEY_HTML_JAVA, NULL),
+ 		NULL);
+ 	g_object_set (settings, "enable-scripts",
+-		gconf_client_get_bool(rss_gconf, GCONF_KEY_HTML_JS, NULL),
++		gconf_client_get_bool(rss_gconf,
++			GCONF_KEY_HTML_JS, NULL),
+ 		NULL);
+ #endif
+ 	webkit_web_view_set_full_content_zoom(
+@@ -2289,7 +2292,8 @@ void org_gnome_cooly_format_rss(void *ep, EMFormatHook
+ #endif
+ 		camel_data_wrapper_write_to_stream(
+ 			mcontent,
+-			(CamelStream *)stream);
++			(CamelStream *)stream,
++			NULL);
+ 		g_byte_array_append (buffer, (unsigned char *)"", 1);
+ //#ifdef EVOLUTION_2_12	//aparently this ("?" char parsing) is fixed in 2.12
+ //		//then again this does not work in evo > 2.12 perhaps is gtkhtml related
+@@ -2485,7 +2489,7 @@ render_body:	if (category)
+ 	}
+ 
+ 	//this is required for proper charset rendering when html
+-	camel_data_wrapper_construct_from_stream(dw, fstream);
++	camel_data_wrapper_construct_from_stream(dw, fstream, NULL);
+ #if EVOLUTION_VERSION >= 23100
+ 	camel_medium_set_content((CamelMedium *)part, dw);
+ #else
+@@ -3634,7 +3638,7 @@ finish_website (SoupSession *soup_sess, SoupMessage *m
+ 		g_free(tmsg);
+ 		if (ub->create) {
+ 			//stream remove
+-			camel_stream_close(ub->stream);
++			camel_stream_close(ub->stream, NULL);
+ #if (DATASERVER_VERSION >= 2031001)
+ 			g_object_unref(ub->stream);
+ #else
+@@ -3643,8 +3647,8 @@ finish_website (SoupSession *soup_sess, SoupMessage *m
+ 		}
+ 	} else {
+ 		if (ub->create) {
+-			camel_stream_write(ub->stream, response->str, strlen(response->str));
+-			camel_stream_close(ub->stream);
++			camel_stream_write(ub->stream, response->str, strlen(response->str), NULL);
++			camel_stream_close(ub->stream, NULL);
+ #if (DATASERVER_VERSION >= 2031001)
+ 			g_object_unref(ub->stream);
+ #else
+@@ -4102,7 +4106,7 @@ check_feed_folder(gchar *folder_name)
+ void
+ rss_delete_feed(gchar *full_path, gboolean folder)
+ {
+-	CamelException ex;
++	GError *error = NULL;
+ 	gchar *tmp, *tkey, *url;
+ 	CamelStore *store;
+ 	gchar *name, *real_name, *buf, *feed_dir, *feed_name;
+@@ -4115,24 +4119,15 @@ rss_delete_feed(gchar *full_path, gboolean folder)
+ 	real_name = g_hash_table_lookup(rf->feed_folders, name);
+ 	if (!real_name)
+ 		real_name = name;
+-	camel_exception_init (&ex);
+-	rss_delete_folders (store, full_path, &ex);
+-	if (camel_exception_is_set (&ex)) {
+-#if EVOLUTION_VERSION < 22904
+-		e_error_run(NULL,
+-			"mail:no-delete-folder",
+-			full_path,
+-			ex.desc,
+-			NULL);
+-#else
++	rss_delete_folders (store, full_path, &error);
++	if (error != NULL) {
+ 		e_alert_run_dialog_for_args(
+ 			e_shell_get_active_window (NULL),
+ 			"mail:no-delete-folder",
+ 			full_path,
+-			ex.desc,
++			error->message,
+ 			NULL);
+-#endif
+-		camel_exception_clear (&ex);
++		g_clear_error(&error);
+ 	}
+ 	//also remove status file
+ 	tkey = g_hash_table_lookup(rf->hrname,
+@@ -4558,7 +4553,6 @@ void org_gnome_cooly_rss_startup(void *ep, ESEventTarg
+ void
+ check_folders(void)
+ {
+-	CamelException ex;
+ 	CamelStore *store = rss_component_peek_local_store();
+ 	CamelFolder *mail_folder, *old_folder;
+ 
+@@ -4573,7 +4567,7 @@ check_folders(void)
+ 	} else if (mail_folder == NULL) {
+ 		camel_store_create_folder (
+ 			store, NULL,
+-			lookup_main_folder(), &ex);
++			lookup_main_folder(), NULL);
+ 		return;
+ 	}
+ #if (DATASERVER_VERSION >= 2031001)
+@@ -5100,7 +5094,6 @@ create_mail(create_feed *CF)
+ 	CamelMimeMessage *new = camel_mime_message_new();
+ 	CamelInternetAddress *addr;
+ 	CamelMessageInfo *info;
+-	CamelException *ex = NULL;
+ 	struct tm tm;
+ 	time_t time, actual_time;
+ 	CamelDataWrapper *rtext;
+@@ -5220,7 +5213,7 @@ create_mail(create_feed *CF)
+ 	stream = camel_stream_mem_new ();
+ 	// w/out an format argument this throws and seg fault
+ 	camel_stream_printf (stream, "%s", CF->body);
+-	camel_data_wrapper_construct_from_stream (rtext, stream);
++	camel_data_wrapper_construct_from_stream (rtext, stream, NULL);
+ #if (DATASERVER_VERSION >= 2031001)
+ 	g_object_unref (stream);
+ #else
+@@ -5311,7 +5304,7 @@ create_mail(create_feed *CF)
+ 		camel_medium_set_content_object(CAMEL_MEDIUM(new), CAMEL_DATA_WRAPPER(rtext));
+ #endif
+ 
+-	camel_folder_append_message(mail_folder, new, info, &appended_uid, ex);
++	camel_folder_append_message(mail_folder, new, info, &appended_uid, NULL);
+ 
+ 	/* no point in filtering mails at import time as it just
+ 	 * wastes time, user can setup his own afterwards
+@@ -5372,12 +5365,13 @@ file_to_message(const char *filename)
+ 	file = (CamelStreamFs *)
+ 			camel_stream_fs_new_with_name(filename,
+ 				O_RDWR|O_CREAT,
+-				0666);
++				0666,
++				NULL);
+ 
+ 	if (!file)
+ 		return NULL;
+ 
+-	camel_data_wrapper_construct_from_stream(content, (CamelStream *)file);
++	camel_data_wrapper_construct_from_stream(content, (CamelStream *)file, NULL);
+ #if (DATASERVER_VERSION >= 2031001)
+ 	g_object_unref((CamelObject *)file);
+ #else
diff --git a/mail/evolution-plugin-rss/pkg/PLIST b/mail/evolution-plugin-rss/pkg/PLIST
index 7fb8b4b62a5..c2cb9e2a8b4 100644
--- a/mail/evolution-plugin-rss/pkg/PLIST
+++ b/mail/evolution-plugin-rss/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.8 2010/04/27 08:11:23 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.9 2010/09/30 16:13:32 ajacoutot Exp $
 @bin bin/evolution-import-rss
 @comment lib/evolution/${EVO_VERSION}/plugins/liborg-gnome-evolution-rss.a
 @comment lib/evolution/${EVO_VERSION}/plugins/liborg-gnome-evolution-rss.la
@@ -6,9 +6,6 @@ lib/evolution/${EVO_VERSION}/plugins/liborg-gnome-evolution-rss.so
 lib/evolution/${EVO_VERSION}/plugins/org-gnome-evolution-rss.eplug
 lib/evolution/${EVO_VERSION}/plugins/org-gnome-evolution-rss.xml
 share/evolution/${EVO_VERSION}/errors/org-gnome-evolution-rss.error
-share/evolution/${EVO_VERSION}/glade/
-share/evolution/${EVO_VERSION}/glade/rss-html-rendering.glade
-share/evolution/${EVO_VERSION}/glade/rss-ui.glade
 share/evolution/${EVO_VERSION}/images/pix.png
 share/evolution/${EVO_VERSION}/images/rss-16.png
 share/evolution/${EVO_VERSION}/images/rss-22.png
@@ -18,6 +15,8 @@ share/evolution/${EVO_VERSION}/images/rss-icon-unread.png
 share/evolution/${EVO_VERSION}/images/rss-text-html.png
 share/evolution/${EVO_VERSION}/images/rss-text-x-generic.png
 share/evolution/${EVO_VERSION}/images/rss.png
+share/evolution/${EVO_VERSION}/ui/rss-html-rendering.ui
+share/evolution/${EVO_VERSION}/ui/rss-main.ui
 share/locale/as/LC_MESSAGES/evolution-rss.mo
 share/locale/bn_IN/LC_MESSAGES/evolution-rss.mo
 share/locale/cs/LC_MESSAGES/evolution-rss.mo
@@ -37,6 +36,7 @@ share/locale/ml/LC_MESSAGES/evolution-rss.mo
 share/locale/mr/LC_MESSAGES/evolution-rss.mo
 share/locale/nb/LC_MESSAGES/evolution-rss.mo
 share/locale/or/LC_MESSAGES/evolution-rss.mo
+share/locale/pa/LC_MESSAGES/evolution-rss.mo
 share/locale/pt/LC_MESSAGES/evolution-rss.mo
 share/locale/pt_BR/LC_MESSAGES/evolution-rss.mo
 share/locale/ro/LC_MESSAGES/evolution-rss.mo