2 files changed, 4 insertions, 3 deletions

diff --git a/mbbsd/io.c b/mbbsd/io.c
index 690b7351..b92c262e 100644
--- a/mbbsd/io.c
+++ b/mbbsd/io.c
@@ -334,6 +334,7 @@ igetch()
 			    currutmp->msgs[0].userid, WATERBALL_GENERAL, NULL);
 #else
 		    switch (currutmp->msgs[0].msgmode) {
+			case MSGMODE_TALK:
 			case MSGMODE_WRITE:
 			    my_write(currutmp->msgs[0].pid, "¤ô²y¥á¹L¥h¡G ",
 				    currutmp->msgs[0].userid, WATERBALL_GENERAL, NULL);
diff --git a/mbbsd/talk.c b/mbbsd/talk.c
index 5097db6a..5ca0648d 100644
--- a/mbbsd/talk.c
+++ b/mbbsd/talk.c
@@ -2130,9 +2130,6 @@ userlist(void)
 	    uentp = currpickup[offset].ui;
 	    fri_stat = currpickup[offset].friend;
 
-	    if (ch == KEY_RIGHT || ch == '\n' || ch == '\r')
-		ch = 't';
-
 	    switch (ch) {
 	    case KEY_LEFT:
 	    case 'e':
@@ -2480,6 +2477,9 @@ userlist(void)
 	    case Ctrl('S'):
 		break;
 
+	    case KEY_RIGHT:
+	    case '\n':
+	    case '\r':
 	    case 't':
 		if (HAS_PERM(PERM_LOGINOK)) {
 		    if (uentp->pid != currpid &&