--- a/fix-date-fill.diff	Fri Mar 04 15:57:04 2016 +0200
+++ b/fix-date-fill.diff	Fri Dec 09 02:12:34 2016 +0200
@@ -1,5 +1,6 @@
 # HG changeset patch
 # Parent 634cc23e8c1c5764623d17d12170b3fb7d67e5d9
+# Parent  d1357df25a61fc92b64302ae645cce5b14b452f2
 Fix empty prefix filling
 Not useful in vanilla, as there's no prefixes
 longer than that static string. Also not add spaces
@@ -7,10 +8,10 @@
 
 XXX: Not really sure about this all, why are we getting rid of spaces in the end?
 
-diff -r 634cc23e8c1c mcabber/mcabber/screen.c
---- a/mcabber/mcabber/screen.c	Fri Oct 17 22:42:07 2014 +0200
-+++ b/mcabber/mcabber/screen.c	Tue Nov 11 20:58:44 2014 +0200
-@@ -1087,9 +1087,9 @@
+diff -r d1357df25a61 mcabber/mcabber/screen.c
+--- a/mcabber/mcabber/screen.c	Fri Dec 09 01:38:42 2016 +0200
++++ b/mcabber/mcabber/screen.c	Fri Dec 09 01:48:22 2016 +0200
+@@ -1115,9 +1115,9 @@
  
    if (line->timestamp &&
        !(line->flags & (HBB_PREFIX_SPECIAL|HBB_PREFIX_CONT))) {
@@ -22,7 +23,7 @@
  
    if (!(line->flags & HBB_PREFIX_CONT)) {
      if (line->flags & HBB_PREFIX_INFO) {
-@@ -1129,13 +1129,12 @@
+@@ -1157,13 +1157,12 @@
          receiptflag = '-';
        g_snprintf(pref, preflen, "%s%c%c> ", date, receiptflag, cryptflag);
      } else if (line->flags & HBB_PREFIX_SPECIAL) {