diff --git a/programs/cmm/liza/liza.c b/programs/cmm/liza/liza.c
index 7f9aa73288..f47afbafdf 100644
--- a/programs/cmm/liza/liza.c
+++ b/programs/cmm/liza/liza.c
@@ -46,9 +46,9 @@ enum {
 #define WIN_H         440
 #define WIN_MIN_W     500
 #define WIN_MIN_H     380
-#define LOGIN_HEADER   "Login - Email client Liza 0.9.3"
-#define OPTIONS_HEADER "Options - Email client Liza 0.9.3"
-#define MAILBOX_HEADER "Mail Box - Email client Liza 0.9.3"
+#define LOGIN_HEADER   "Login - Email client Liza 0.9.4"
+#define OPTIONS_HEADER "Options - Email client Liza 0.9.4"
+#define MAILBOX_HEADER "Mail Box - Email client Liza 0.9.4"
 #define BUFFERSIZE		512	
 proc_info Form;
 #define LBUMP 0xFFFfff
diff --git a/programs/cmm/liza/login.c b/programs/cmm/liza/login.c
index 15260ddae0..099172b65a 100644
--- a/programs/cmm/liza/login.c
+++ b/programs/cmm/liza/login.c
@@ -110,7 +110,7 @@ void LoginNetworkProcess()
 
 void LoginBoxLoop()
 {
-	int key, id;
+	int id;
 
 	SetLoginStatus(NULL);
 	goto _LB_DRAW;
@@ -138,8 +138,8 @@ void LoginBoxLoop()
 				break;
 				
 			case evKey:
-				key = GetKey();
-				if (key==9)
+				GetKeys();
+				if (key_scancode==SCAN_CODE_TAB)
 				{
 					if (login_box.flags & 0b10)
 						{ pass_box.flags = 0b11; login_box.flags = 0; }
@@ -149,13 +149,13 @@ void LoginBoxLoop()
 					edit_box_draw stdcall(#pass_box);
 					break;				
 				}
-				if (key==13) && (!aim)
+				if (key_scancode==SCAN_CODE_ENTER) && (!aim)
 				{
 					aim=RESOLVE;
 					GetSettings();
 					DrawLoginScreen();
 				}
-				EAX=key<<8;
+				EAX=key_ascii<<8;
 				edit_box_key stdcall(#login_box);
 				edit_box_key stdcall(#pass_box);
 				break;
diff --git a/programs/cmm/liza/mail_box.c b/programs/cmm/liza/mail_box.c
index a1a32f67ac..5309f863fb 100644
--- a/programs/cmm/liza/mail_box.c
+++ b/programs/cmm/liza/mail_box.c
@@ -140,7 +140,7 @@ void MailBoxNetworkProcess() {
 
 
 void MailBoxLoop() {
-	int key, id;
+	int id;
 	int panels_drag=0, clicked_list=0;
 	dword line_col, text_col;
 
@@ -249,9 +249,9 @@ void MailBoxLoop() {
 
 				break;				
 			case evKey:
-				key = GetKey();
+				GetKeys();
 
-				if (!aim) && (mail_list.ProcessKey(key))
+				if (!aim) && (mail_list.ProcessKey(key_scancode))
 				{
 					DrawMailList();
 					aim = SEND_RETR;
diff --git a/programs/cmm/liza/settings.c b/programs/cmm/liza/settings.c
index 00b424a1a3..21f8f10d65 100644
--- a/programs/cmm/liza/settings.c
+++ b/programs/cmm/liza/settings.c
@@ -64,10 +64,10 @@ void SettingsDialog()
 				break;
 				
 			case evKey:
-				key = GetKey();
+				GetKeys();;
 
 				if (checked[1]==0) break;
-				if (key==9)
+				if (key_scancode==SCAN_CODE_TAB)
 				{
 					if (POP_server_box.flags & 0b10)       { POP_server_box.flags -= 0b10;         POP_server_port_box.flags += 0b10;  } else
 					if (POP_server_port_box.flags & 0b10)  { POP_server_port_box.flags -= 0b10;    SMTP_server_box.flags += 0b10;      } else
@@ -77,7 +77,7 @@ void SettingsDialog()
 					OptionsWindow();
 				}
 				
-				EAX=key<<8;
+				EAX=key_ascii<<8;
 				edit_box_key stdcall(#POP_server_box);
 				edit_box_key stdcall(#POP_server_port_box);
 				edit_box_key stdcall(#SMTP_server_box);