diff -ruN msnlib-d1/doc/Changelog msnlib-d2/doc/Changelog
--- msnlib-d1/doc/Changelog	Mon Oct 28 19:25:35 2002
+++ msnlib-d2/doc/Changelog	Wed Oct 30 19:14:58 2002
@@ -1,3 +1,13 @@
+30 Oct 02 18.35.28 - Alberto <albertogli@telpin.com.ar>
+ * msn: esthetic changes
+ * msn: d2 tag
+
+29 Oct 02 08.50.14 - Alberto <albertogli@telpin.com.ar>
+ * msn: fix a small bug with the up and down keys
+ * msn: another small fix to ignore unknown escape sequences
+ * msn: change the order of tab keystrokes, now received goes first
+ * msn: don't print the prompt on exit
+
 28 Oct 02 18.45.12 - Alberto <albertogli@telpin.com.ar>
  * msn: handle screen width appropiatedly
  * tag: d1 tag
diff -ruN msnlib-d1/msn msnlib-d2/msn
--- msnlib-d1/msn	Mon Oct 28 19:59:38 2002
+++ msnlib-d2/msn	Wed Oct 30 18:35:02 2002
@@ -174,7 +174,6 @@
 		termios.tcsetattr(sys.stdin.fileno(), termios.TCSAFLUSH, oldtermattr)
 	except:
 		pass
-	redraw_cli()
 	sys.exit(code)
 
 def nick2email(nick):
@@ -335,10 +334,10 @@
 			inbuf = inbuf[:-2]
 			redraw_cli()
 		elif char == '\t':				# tab
-			if len(inbuf) == 1 and email2nick(last_sent):
-				inbuf = 'm ' + email2nick(last_sent) + ' '
-			elif len(inbuf) == 1 and email2nick(last_received):
+			if len(inbuf) == 1 and email2nick(last_received):
 				inbuf = 'm ' + email2nick(last_received) + ' '
+			elif len(inbuf) == 1 and email2nick(last_sent):
+				inbuf = 'm ' + email2nick(last_sent) + ' '
 			else:
 				inbuf = inbuf[:-1]
 				beep()
@@ -368,11 +367,13 @@
 					in_esc = 2
 				else:
 					in_esc = 0
+				inbuf = inbuf[:-1]
 			elif in_esc == 2:
 				if char == 'A':			# up
 					if inbuf_history[1] == -1:
-						# hit the top, or it's empty
-						pass
+						# hit the top, or it's empty;
+						# remove it from the buffer
+						inbuf = inbuf[:-1]
 					else:
 						clear_line()
 						pos = inbuf_history[1]
@@ -381,8 +382,9 @@
 						redraw_cli()
 				elif char == 'B':		# down
 					if not inbuf_history[0]:
-						# empty
-						pass
+						# it's empty, so we only
+						# remove it from the buffer
+						inbuf = inbuf[:-1]
 					elif inbuf_history[1] == len(inbuf_history[0]) - 1:
 						# hit the bottom, clear the buffer
 						clear_line()
@@ -394,8 +396,9 @@
 						pos = inbuf_history[1]
 						inbuf = inbuf_history[0][pos]
 						redraw_cli()
+				else:				# unhandled esc
+					inbuf = inbuf[:-1]
 				in_esc = 0
-			inbuf = inbuf[:-1]
 
 def redraw_cli():
 	"""Redraws the current prompt line, including user input; it first
@@ -848,7 +851,7 @@
 #
 # now the real thing
 #
-printl('Starting up MSN Client D1\n', c.yellow, 1)
+printl('* MSN Client (release D2) *\n', c.yellow, 1)
 
 # first, the configuration
 printl('Loading config... ', c.green, 1)
diff -ruN msnlib-d1/msnsetup msnlib-d2/msnsetup
--- msnlib-d1/msnsetup	Mon Oct 28 19:25:35 2002
+++ msnlib-d2/msnsetup	Wed Oct 30 18:13:36 2002
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VER="D1"
+VER="D2"
 
 function intro() {
 	echo
diff -ruN msnlib-d1/setup.py msnlib-d2/setup.py
--- msnlib-d1/setup.py	Mon Oct 28 19:25:35 2002
+++ msnlib-d2/setup.py	Wed Oct 30 18:13:45 2002
@@ -2,7 +2,7 @@
 from distutils.core import setup
 
 setup(name="msnlib",
-	version="D1",
+	version="D2",
 	description="MSN Messenger Library and Client",
 	author="Alberto Bertogli",
 	author_email="albertogli@telpin.com.ar",