diff -Nru evolution-3.18.5.2/debian/changelog evolution-3.18.5.2/debian/changelog
--- evolution-3.18.5.2/debian/changelog	2016-06-23 09:05:33.000000000 -0500
+++ evolution-3.18.5.2/debian/changelog	2016-08-16 11:59:42.000000000 -0500
@@ -1,3 +1,10 @@
+evolution (3.18.5.2-0ubuntu3.2) xenial-proposed; urgency=medium
+
+  * debian/patches/lp1613805.patch: EHTMLEditorView - Restore the selection
+    end mark correctly when processing HTML to plain text (LP: #1613805)
+
+ -- Jamie Strandboge <jamie@ubuntu.com>  Tue, 16 Aug 2016 11:58:48 -0500
+
 evolution (3.18.5.2-0ubuntu3.1) xenial; urgency=medium
 
   * debian/control:
diff -Nru evolution-3.18.5.2/debian/patches/lp1613805.patch evolution-3.18.5.2/debian/patches/lp1613805.patch
--- evolution-3.18.5.2/debian/patches/lp1613805.patch	1969-12-31 18:00:00.000000000 -0600
+++ evolution-3.18.5.2/debian/patches/lp1613805.patch	2016-08-16 11:58:45.000000000 -0500
@@ -0,0 +1,28 @@
+Origin: backport, 57d35451d638a5661b5ce6ea26d02f2d97a62504
+Author: Tomas Popela <tpopela redhat com>
+Date:   Tue May 31 11:36:39 2016 +0200
+
+    EHTMLEditorView - Restore the selection end mark correctly when processing
+    HTML to plain text
+
+    Otherwise the ##SELECTON_END## string could be left in the output.
+
+ .../e-html-editor-view-dom-functions.c             |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+---
+
+Index: evolution-3.18.5.2/e-util/e-html-editor-view.c
+===================================================================
+--- evolution-3.18.5.2.orig/e-util/e-html-editor-view.c
++++ evolution-3.18.5.2/e-util/e-html-editor-view.c
+@@ -7326,8 +7326,8 @@ replace_selection_markers (gchar **text)
+ 
+ 		tmp = e_str_replace_string (
+ 			*text,
+-			"##SELECTION_START##",
+-			"<span id=\"-x-evo-selection-start-marker\"></span>");
++			"##SELECTION_END##",
++			"<span id=\"-x-evo-selection-end-marker\"></span>");
+ 
+ 		g_free (*text);
+ 		*text = g_string_free (tmp, FALSE);
diff -Nru evolution-3.18.5.2/debian/patches/series evolution-3.18.5.2/debian/patches/series
--- evolution-3.18.5.2/debian/patches/series	2016-03-16 11:52:57.000000000 -0500
+++ evolution-3.18.5.2/debian/patches/series	2016-08-16 11:56:34.000000000 -0500
@@ -2,3 +2,4 @@
 02_nss_paths.patch
 10_revert_libevolution_avoid-version.patch
 alarm-notify-nodisplay.patch
+lp1613805.patch