diff --git a/docs/notework.txt b/docs/notework.txt
index 683a00a..b6f5510 100644
--- a/docs/notework.txt
+++ b/docs/notework.txt
@@ -12,6 +12,9 @@ ______________________________________________________________________
                Notes for GoldED+ 1.1.5, /snapshot/
 ______________________________________________________________________
 
+- Fixed infinite loop when last message is twitkill, previous deleted
+  and showdeleted is off (untested).
+
 - Fixed header encoding in exported SOUP packets.
 
 - Fixed small problem in editor when quoteline might left not painted
diff --git a/golded3/geread.cpp b/golded3/geread.cpp
index 44ba191..6ae1df6 100644
--- a/golded3/geread.cpp
+++ b/golded3/geread.cpp
@@ -386,8 +386,11 @@ void Reader() {
 
               switch(istwit) {
                 case TWIT_KILL:
-                  TwitDeleteMsg(msg);
-                  continue;
+                  if(not msg->attr.del()) {
+                    // prevent infinite loop on the last message
+                    TwitDeleteMsg(msg);
+                    continue;
+                  }
                 case TWIT_SKIP:
                   reader_keycode = ReaderGetKey();
                   break;