diff --git a/src/ui/buffer.c b/src/ui/buffer.c
index a4ae41da..916aba1a 100644
--- a/src/ui/buffer.c
+++ b/src/ui/buffer.c
@@ -106,6 +106,19 @@ buffer_append(ProfBuff buffer, const char show_char, int pad_indent, GDateTime *
     buffer->entries = g_slist_append(buffer->entries, e);
 }
 
+void
+buffer_remove_entry_by_id(ProfBuff buffer, const char *const id)
+{
+    GSList *entries = buffer->entries;
+    while (entries) {
+        ProfBuffEntry *entry = entries->data;
+        if (entry->id && (g_strcmp0(entry->id, id) == 0)) {
+            buffer->entries = g_slist_delete_link(buffer->entries, entries);
+        }
+        entries = g_slist_next(entries);
+    }
+}
+
 gboolean
 buffer_mark_received(ProfBuff buffer, const char *const id)
 {
diff --git a/src/ui/buffer.h b/src/ui/buffer.h
index 67cd6d5b..10151d17 100644
--- a/src/ui/buffer.h
+++ b/src/ui/buffer.h
@@ -64,6 +64,7 @@ ProfBuff buffer_create();
 void buffer_free(ProfBuff buffer);
 void buffer_append(ProfBuff buffer, const char show_char, int pad_indent, GDateTime *time,
     int flags, theme_item_t theme_item, const char *const from, const char *const message, DeliveryReceipt *receipt, const char *const id);
+void buffer_remove_entry_by_id(ProfBuff buffer, const char *const id);
 int buffer_size(ProfBuff buffer);
 ProfBuffEntry* buffer_get_entry(ProfBuff buffer, int entry);
 ProfBuffEntry* buffer_get_entry_by_id(ProfBuff buffer, const char *const id);
diff --git a/src/ui/chatwin.c b/src/ui/chatwin.c
index d92f0de4..8faf4934 100644
--- a/src/ui/chatwin.c
+++ b/src/ui/chatwin.c
@@ -286,6 +286,7 @@ chatwin_incoming_msg(ProfChatWin *chatwin, ProfMessage *message, gboolean win_cr
             }
         }
 
+        win_insert_last_read_position_marker((ProfWin*)chatwin, chatwin->barejid);
         win_print_incoming(window, display_name, message);
     }
 
diff --git a/src/ui/core.c b/src/ui/core.c
index 8c7eca2e..6bf43d94 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -656,6 +656,14 @@ ui_focus_win(ProfWin *window)
         cmd_ac_remove_form_fields(confwin->form);
     }
 
+    // TODO: if old win is chatwin; and has lastreadline; then remove that line
+    if (old_current->type == WIN_CHAT) {
+        ProfChatWin *chatwin = (ProfChatWin*)old_current;
+        assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);
+        //win_update_entry_message_real(old_current, chatwin->barejid, "$$$");
+        win_remove_entry_message(old_current, chatwin->barejid);
+    }
+
     if (window->type == WIN_CONFIG) {
         ProfConfWin *confwin = (ProfConfWin*)window;
         cmd_ac_add_form_fields(confwin->form);
diff --git a/src/ui/window.c b/src/ui/window.c
index 2a76496c..e592aa2e 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -1354,6 +1354,13 @@ win_update_entry_message(ProfWin *window, const char *const id, const char *cons
     }
 }
 
+void
+win_remove_entry_message(ProfWin *window, const char *const id)
+{
+    buffer_remove_entry_by_id(window->layout->buffer, id);
+    win_redraw(window);
+}
+
 void
 win_newline(ProfWin *window)
 {
@@ -1809,3 +1816,29 @@ win_handle_command_exec_result_note(ProfWin *window, const char *const type, con
     assert(window != NULL);
     win_println(window, THEME_DEFAULT, '!', value);
 }
+
+void
+win_print_separator(ProfWin *window)
+{
+    int cols = getmaxx(window->layout->win);
+
+    int i;
+    for (i=1; i<cols; i++) {
+        wprintw(window->layout->win, "-");
+    }
+}
+
+void
+win_insert_last_read_position_marker(ProfWin *window, char* id)
+{
+    GDateTime *time = g_date_time_new_now_local();
+
+    buffer_append(window->layout->buffer, ' ', 0, time, 0, THEME_TEXT, NULL, "-----", NULL, id);
+    // can we leave this? TODO
+    //    win_print_separator(window);
+    //_win_print(window, '-', 0, time, 0, THEME_TEXT, NULL, "---", NULL);
+    win_redraw(window);
+
+    g_date_time_unref(time);
+}
+
diff --git a/src/ui/window.h b/src/ui/window.h
index 79def390..b1f9a4af 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -90,4 +90,7 @@ void win_page_down(ProfWin *window);
 void win_sub_page_down(ProfWin *window);
 void win_sub_page_up(ProfWin *window);
 
+void win_insert_last_read_position_marker(ProfWin *window, char* id);
+void win_remove_entry_message(ProfWin *window, const char *const id);
+
 #endif