--- kbiff/setupdlg.cpp.orig	Sat Jun  6 22:59:51 1998
+++ kbiff/setupdlg.cpp	Sat Jul 11 22:41:59 1998
@@ -24,21 +24,25 @@
 //////////////////////////////////////////////////////////////////////
 const char* KBiffScramble::scramble(const char* text)
 {
-	return m_scramble(text, true);
-}
+	char *ptr = new char[strlen(text) * 2 + 1];
+	char *ret_ptr = ptr;
 
-const char* KBiffScramble::unscramble(const char* text)
-{
-	return m_scramble(text, false);
+	for (; *text; text++, ptr += 2) {
+		ptr[0] = 'a' + ((*text + 4) >> 4);
+		ptr[1] = 'a' + ((*text + 4) & 0x0f);
+	}
+	*ptr = '\0';
+
+	return ret_ptr;
 }
 
-const char* KBiffScramble::m_scramble(const char* text, bool state)
+const char* KBiffScramble::unscramble(const char* text)
 {
-	char *ptr = new char[strlen(text)];
+	char *ptr = new char[strlen(text) / 2 + 1];
 	char *ret_ptr = ptr;
 
-	while (*text)
-		*ptr++ = state ? (*(text++) - 4) : (*(text++) + 4);
+	for (; *text; text += 2, ptr++)
+		*ptr = (((text[0] - 'a') << 4) | (text[1] - 'a')) - 4;
 	*ptr = '\0';
 
 	return ret_ptr;
@@ -757,7 +761,7 @@
 			QFileInfo mailbox(getenv("MAIL"));
 			if (mailbox.exists() == false)
 			{
-				QString s("/var/spool/mail/");
+				QString s("/var/mail/");
 				s += getlogin();
 				mailbox.setFile(s);
 			}
@@ -1003,7 +1007,7 @@
 	QFileInfo mailbox(getenv("MAIL"));
 	if (mailbox.exists() == false)
 	{
-		QString s("/var/spool/mail/");
+		QString s("/var/mail/");
 		s += getlogin();
 		mailbox.setFile(s);
 	}
