diff --git a/src/Text2.cpp b/src/Text2.cpp
index b2b1dcab5b..62cff3ec03 100644
--- a/src/Text2.cpp
+++ b/src/Text2.cpp
@@ -1159,7 +1159,8 @@ bool Text::deleteEmptyParagraphMechanism(Cursor & cur,
 		    && old.pos() < oldpar.size()
 		    && oldpar.isLineSeparator(old.pos())
 		    && oldpar.isLineSeparator(old.pos() - 1)
-		    && !oldpar.isDeleted(old.pos() - 1)) {
+		    && !oldpar.isDeleted(old.pos() - 1)
+		    && !oldpar.isDeleted(old.pos())) {
 			oldpar.eraseChar(old.pos() - 1, cur.buffer().params().trackChanges);
 #ifdef WITH_WARNINGS
 #warning This will not work anymore when we have multiple views of the same buffer
diff --git a/status.15x b/status.15x
index 21c3319c25..de1e7a020d 100644
--- a/status.15x
+++ b/status.15x
@@ -102,10 +102,12 @@ What's new
 
 - Reset current cursor font when going to a bookmark.
 
-- Fix crash when login out from within Gnome desktop (Bug 1656).
+- Fix crash when login out from within Gnome desktop (bug 1656).
 
 - Fix crash when inserting float.
 
+- Fix wrong handling of spaces in change tracking mode (bug 3961).
+
 
 * DOCUMENTATION