diff --git a/wmail/ChangeLog b/wmail/ChangeLog
index 207f969..aee97fb 100644
--- a/wmail/ChangeLog
+++ b/wmail/ChangeLog
@@ -1,3 +1,53 @@
+2019-06-21  Jeremy Sowden <jeremy@azazel.net>
+
+	* wmail/ChangeLog, wmail/README, wmail/configure.ac,
+	wmail/wmailrc-sample: wmail: updated change-log and bumped to 2.3.
+
+2019-06-21  Jeremy Sowden <jeremy@azazel.net>
+
+	* wmail/src/wmail.c: wmail: fixed use-after-free.  The CleanupNames() function removed the sender-addresses for deleted
+	mails, but did not set the namesChanged flag to true.  This meant
+	that if the ticker was displaying the address of a mail which had
+	been deleted it would continue doing so after the address had been
+	freed.
+
+2019-06-13  Jeremy Sowden <jeremy@azazel.net>
+
+	* wmail/src/config.c, wmail/src/wmail.c: wmail: handle allocation
+	failures.  Check the return values of some invocations of malloc and strdup and
+	ensure that any NULL's are handled correctly.
+
+2019-06-13  Jeremy Sowden <jeremy@azazel.net>
+
+	* wmail/src/config.c: wmail: fixed possible NULL-pointer dereference
+	in config-parser.  The code calling Tokenize assumed that if it returned true, value
+	would not be NULL.  However, in the case of a line containing no
+	equals sign:   blah that would not be the case.  Changed Tokenize to return false unless
+	id and value are both defined.
+
+2019-06-13  Jeremy Sowden <jeremy@azazel.net>
+
+	* wmail/src/wmail.c: wmail: fixed NULL-pointer dereference if
+	opendir(3) fails.  Code was:   if (( dir = opendir( ... )))   {     // ...    }   closedir( dir ); // dir may be NULL Moved closedir(3) inside if-block.
+
+2019-06-13  Jeremy Sowden <jeremy@azazel.net>
+
+	* wmail/src/wmail.c: wmail: use continue instead of goto.
+
+2019-06-13  Jeremy Sowden <jeremy@azazel.net>
+
+	* wmail/src/common.c, wmail/src/config.c, wmail/src/wmail.c: wmail:
+	formatting improvements.
+
+2019-06-13  Jeremy Sowden <jeremy@azazel.net>
+
+	* wmail/src/common.h: wmail: debug macro fixes.
+
+2019-06-13  Jeremy Sowden <jeremy@azazel.net>
+
+	* wmail/README, wmail/src/config.c, wmail/wmailrc-sample: wmail:
+	fixed config typo.  The old spelling is still supported.
+
 2019-06-12  Jeremy Sowden <jeremy@azazel.net>
 
 	* wmail/ChangeLog, wmail/README, wmail/configure.ac,
diff --git a/wmail/README b/wmail/README
index 2a108d8..d542410 100644
--- a/wmail/README
+++ b/wmail/README
@@ -1,6 +1,6 @@
 Name            : wmail
 Description     : a enhanced Window Maker email flagging docklet
-Current version : 2.2
+Current version : 2.3
 Licence         : see file COPYING for licencing details
 Web/Home        : https://www.dockapps.net/wmail
 Contact         : Window Maker Developers <wmaker-dev@googlegroups.com>
diff --git a/wmail/configure.ac b/wmail/configure.ac
index 2a1d083..049f9c2 100644
--- a/wmail/configure.ac
+++ b/wmail/configure.ac
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([wmail], [2.2], [wmaker-dev@googlegroups.com])
+AC_INIT([wmail], [2.3], [wmaker-dev@googlegroups.com])
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_SRCDIR([src/wmail.c])
 AM_INIT_AUTOMAKE([foreign])
diff --git a/wmail/wmailrc-sample b/wmail/wmailrc-sample
index bd44d45..16c4136 100644
--- a/wmail/wmailrc-sample
+++ b/wmail/wmailrc-sample
@@ -1,6 +1,6 @@
 #-*-shell-script-*-############################################################
 #
-# .wmailrc - wmail v2.2 configuration file
+# .wmailrc - wmail v2.3 configuration file
 # note: cmd-line options always overide the settings in this file unless you
 # force runtime reconfiguration by clicking on the docklets display area
 #