diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
index 1bec8a72e6..54e23c83ed 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
@@ -1287,10 +1287,15 @@ public class WebMail extends HttpServlet
 			
 			if( sessionObject.state == STATE_SHOW ) {
 				processMessageButtons( sessionObject, request );
-				Mail mail = sessionObject.mailCache.getMail( sessionObject.showUIDL, MailCache.FETCH_ALL );
-				if( mail != null && mail.error.length() > 0 ) {
-					sessionObject.error += mail.error;
-					mail.error = "";
+				// If the last message has just been deleted then
+				// sessionObject.state = STATE_LIST and
+				// sessionObject.showUIDL = null
+				if ( sessionObject.showUIDL != null ) {
+					Mail mail = sessionObject.mailCache.getMail( sessionObject.showUIDL, MailCache.FETCH_ALL );
+					if( mail != null && mail.error.length() > 0 ) {
+						sessionObject.error += mail.error;
+						mail.error = "";
+					}
 				}
 			}
 			
diff --git a/history.txt b/history.txt
index ec0641461d..decffe34ab 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,6 @@
+2013-11-23 str4d
+ * susimail: Fix NPE when deleting last message (ticket #414)
+
 2013-11-19 kytv
 
  * Translation updates and start of Japanese translation pulled from Transifex