diff --git a/evolution-alarm-notify-do-not-use-markup.patch b/evolution-alarm-notify-do-not-use-markup.patch
new file mode 100644
index 0000000..ae21a97
--- /dev/null
+++ b/evolution-alarm-notify-do-not-use-markup.patch
@@ -0,0 +1,34 @@
+From 7dc7f0d9574355e5ad94a842ac3769d6e2313743 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Wed, 16 May 2018 11:59:51 +0200
+Subject: [alarm-notify] Do not use markup around organizer name in libnotify
+ text
+
+This markup (making the text bold) might not be always used in the notification,
+resulting in the markup being shown to the user instead.
+---
+ src/calendar/alarm-notify/alarm-queue.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/calendar/alarm-notify/alarm-queue.c b/src/calendar/alarm-notify/alarm-queue.c
+index c248f39..e1070fa 100644
+--- a/src/calendar/alarm-notify/alarm-queue.c
++++ b/src/calendar/alarm-notify/alarm-queue.c
+@@ -1965,12 +1965,12 @@ popup_notification (time_t trigger,
+ 	if (organiser.cn) {
+ 		if (location)
+ 			body = g_strdup_printf (
+-				"<b>%s</b>\n%s %s\n%s %s",
++				"%s\n%s %s\n%s %s",
+ 				organiser.cn, _("Location:"),
+ 				location, start_str, time_str);
+ 		else
+ 			body = g_strdup_printf (
+-				"<b>%s</b>\n%s %s",
++				"%s\n%s %s",
+ 				organiser.cn, start_str, time_str);
+ 	}
+ 	else {
+-- 
+cgit v0.12
+
diff --git a/evolution-autoArchive-archives-Junk-and-Deleted-too.patch b/evolution-autoArchive-archives-Junk-and-Deleted-too.patch
new file mode 100644
index 0000000..f4e299b
--- /dev/null
+++ b/evolution-autoArchive-archives-Junk-and-Deleted-too.patch
@@ -0,0 +1,47 @@
+From ccc936b4971a8f9a9be7f4712a5dd23813c936cf Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Mon, 14 May 2018 11:51:13 +0200
+Subject: Bug 795977 - AutoArchive archives Junk and Deleted messages too
+
+---
+ src/mail/em-utils.c | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/src/mail/em-utils.c b/src/mail/em-utils.c
+index 0f604bd..fd39154 100644
+--- a/src/mail/em-utils.c
++++ b/src/mail/em-utils.c
+@@ -1803,12 +1803,16 @@ em_utils_process_autoarchive_sync (EMailBackend *mail_backend,
+ 
+ 	g_date_time_unref (now_time);
+ 
+-	search_sexp = g_strdup_printf ("(match-all (< (get-sent-date) %" G_GINT64_FORMAT "))", g_date_time_to_unix (use_time));
++	search_sexp = g_strdup_printf ("(match-all (and "
++		"(not (system-flag \"junk\")) "
++		"(not (system-flag \"deleted\")) "
++		"(< (get-sent-date) %" G_GINT64_FORMAT ")"
++		"))", g_date_time_to_unix (use_time));
+ 	uids = camel_folder_search_by_expression (folder, search_sexp, cancellable, error);
+ 
+ 	if (!uids) {
+ 		success = FALSE;
+-	} else {
++	} else if (uids->len > 0) {
+ 		gint ii;
+ 
+ 		if (aa_config == E_AUTO_ARCHIVE_CONFIG_MOVE_TO_ARCHIVE ||
+@@ -1863,9 +1867,10 @@ em_utils_process_autoarchive_sync (EMailBackend *mail_backend,
+ 
+ 			camel_folder_thaw (folder);
+ 		}
++	}
+ 
++	if (uids)
+ 		camel_folder_search_free (folder, uids);
+-	}
+ 
+ 	g_free (search_sexp);
+ 	g_free (aa_custom_target_folder_uri);
+-- 
+cgit v0.12
+
diff --git a/evolution.changes b/evolution.changes
index 602a0ac..a2c3940 100644
--- a/evolution.changes
+++ b/evolution.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed May 16 21:47:45 UTC 2018 - bjorn.lie@gmail.com
+
+- Add evolution-autoArchive-archives-Junk-and-Deleted-too.patch:
+  AutoArchive archives Junk and Deleted messages too (bgo#795977).
+- Add evolution-alarm-notify-do-not-use-markup.patch: alarm-notify:
+  Do not use markup around organizer name in libnotify text.
+
 -------------------------------------------------------------------
 Mon May  7 09:27:30 UTC 2018 - bjorn.lie@gmail.com
 
diff --git a/evolution.spec b/evolution.spec
index 1a4fa93..100e7d0 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -33,6 +33,11 @@ License:        LGPL-2.0-only AND LGPL-3.0-only
 Group:          Productivity/Networking/Email/Clients
 URL:            http://wiki.gnome.org/Apps/Evolution/
 Source0:        http://download.gnome.org/sources/evolution/%{evolution_base_version}/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM evolution-autoArchive-archives-Junk-and-Deleted-too.patch bgo#795977 -- AutoArchive archives Junk and Deleted messages too
+Patch0:         evolution-autoArchive-archives-Junk-and-Deleted-too.patch
+# PATCH-FIX-UPSTREAM evolution-alarm-notify-do-not-use-markup.patch -- [alarm-notify] Do not use markup around organizer name in libnotify text
+Patch1:         evolution-alarm-notify-do-not-use-markup.patch
+
 # The icon we rely on is from adwaita-icon-theme
 BuildRequires:  adwaita-icon-theme
 BuildRequires:  bison
@@ -161,7 +166,7 @@ to develop applications that require these.
 %lang_package
 
 %prep
-%setup -q
+%autosetup -p1
 translation-update-upstream
 
 %build