diff --git a/evolution-data-server-3.5.4-vtrash-mem.patch b/evolution-data-server-3.5.4-vtrash-mem.patch
new file mode 100644
index 0000000..976da91
--- /dev/null
+++ b/evolution-data-server-3.5.4-vtrash-mem.patch
@@ -0,0 +1,18 @@
+diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c
+index c46cea0..bc4fd99 100644
+--- a/camel/camel-vee-folder.c
++++ b/camel/camel-vee-folder.c
+@@ -276,6 +276,13 @@ vee_folder_merge_matching (CamelVeeFolder *vfolder,
+ 		g_object_unref (mi_data);
+ 	}
+ 
++	/* Not a real search folder influencing Unmatched folder, thus skip it.
++	   The removal requires CamelVeeMessageInfoData, which is added on demand
++	   to CamelVeeDataCache, thus even the virtual trash/junk folder doesn't
++	   need it, it is left in the data_cache since then on */
++	if (!vfolder->priv->parent_vee_store)
++		return;
++
+ 	rud.vfolder = vfolder;
+ 	rud.vsummary = vsummary;
+ 	rud.subfolder = subfolder;
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 1f86e94..fe4fbc1 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -27,7 +27,7 @@
 
 Name: evolution-data-server
 Version: 3.5.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
 License: LGPLv2+
@@ -43,6 +43,8 @@ Obsoletes: evolution-webcal < 2.24.0
 # RH bug #243296
 Patch01: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
+Patch02: evolution-data-server-3.5.4-vtrash-mem.patch
+
 ### Build Dependencies ###
 
 BuildRequires: bison
@@ -123,6 +125,7 @@ This package contains developer documentation for %{name}.
 %setup -q
 
 %patch01 -p1 -b .fix-64bit-acinclude
+%patch02 -p1 -b .vtrash-mem
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -367,6 +370,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Thu Jul 26 2012 Milan Crha <mcrha@redhat.com> - 3.5.4-3
+- Add patch for less memory usage from vTrash camel folders
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild