diff --git a/golded3/gckeys.cpp b/golded3/gckeys.cpp
index 9fafa81..91feb3e 100644
--- a/golded3/gckeys.cpp
+++ b/golded3/gckeys.cpp
@@ -427,10 +427,10 @@ tglobalkey globalkeys[] = {
   { CRC_K_CPGUP                , Key_C_PgUp              ,    0 }, // 0x2603
   { CRC_READGOTOPREVUNREAD     , KK_ReadGotoPrevUnread   , KT_R }, // 0x27EA
   { CRC_READTOGGLEREALMSGNO    , KK_ReadToggleRealMsgno  , KT_R }, // 0x2A3B
-  { CRC_ADDRESSBOOKADD         , KK_AddressbookAdd       , KT_B }, // 0x2C5C
+  { CRC_ADDRESSBOOKPACK        , KK_AddressbookPack      , KT_B }, // 0x2C5C
   { CRC_HEADERTOGGLERETRECREQ  , KK_HeaderToggleRetrecreq, KT_H }, // 0x2CF1
   { CRC_HEADERTOGGLECRASH      , KK_HeaderToggleCrash    , KT_H }, // 0x2CF9
-  { CRC_ADDRESSBOOKDELETE      , KK_AddressbookDelete    , KT_B }, // 0x2D4A
+  { CRC_ADDRESSBOOKSELECT      , KK_AddressbookSelect    , KT_B }, // 0x2D4A
   { CRC_AREADOSSHELL           , KK_AreaDosShell         , KT_A }, // 0x2DED
   { CRC_K_DOWN                 , Key_Dwn                 ,    0 }, // 0x2F6D
   { CRC_READNEWMSG             , KK_ReadNewMsg           , KT_R }, // 0x30CA
@@ -617,7 +617,7 @@ tglobalkey globalkeys[] = {
   { CRC_K_APGDN                , Key_A_PgDn              ,    0 }, // 0x6F7F
   { CRC_HEADERTOGGLEATTRWIN    , KK_HeaderToggleAttrWin  , KT_H }, // 0x6F95
   { CRC_K_HOME                 , Key_Home                ,    0 }, // 0x700B
-  { CRC_ADDRESSBOOKSELECT      , KK_AddressbookSelect    , KT_B }, // 0x70D1
+  { CRC_ADDRESSBOOKDELETE      , KK_AddressbookDelete    , KT_B }, // 0x70D1
   { CRC_EDITGOPGUP             , KK_EditGoPgUp           , KT_E }, // 0x7163
   { CRC_READMSGLINEUP          , KK_ReadMsgLineUp        , KT_R }, // 0x7238
   { CRC_EDITHEADER             , KK_EditHeader           , KT_E }, // 0x726F
@@ -836,7 +836,7 @@ tglobalkey globalkeys[] = {
   { CRC_READCHANGEORIGIN       , KK_ReadChangeOrigin     , KT_R }, // 0xFD2C
   { CRC_FILEDOSSHELL           , KK_FileDosShell         , KT_F }, // 0xFE9D
   { CRC_EDITLOOKUPDEST         , KK_EditLookupDest       , KT_E }, // 0xFEC4
-  { CRC_ADDRESSBOOKPACK        , KK_AddressbookPack      , KT_B }, // 0xFF55
+  { CRC_ADDRESSBOOKADD         , KK_AddressbookAdd       , KT_B }, // 0xFF55
   { CRC_AREAMACRO              , KK_AreaMacro            , KT_A }, // 0xFFA7
 };
 
diff --git a/golded3/gckeys.h b/golded3/gckeys.h
index fb15bfd..2d179ca 100644
--- a/golded3/gckeys.h
+++ b/golded3/gckeys.h
@@ -292,10 +292,10 @@ const word CRC_READUUDECODE         = 0x4F0B;
 const word CRC_READWRITEMSG         = 0x73AC;
 
 const word CRC_ADDRESSBOOKQUIT      = 0x47C7;
-const word CRC_ADDRESSBOOKADD       = 0x2C5C;
-const word CRC_ADDRESSBOOKSELECT    = 0x70D1;
-const word CRC_ADDRESSBOOKDELETE    = 0x2D4A;
-const word CRC_ADDRESSBOOKPACK      = 0xFF55;
+const word CRC_ADDRESSBOOKADD       = 0xFF55;
+const word CRC_ADDRESSBOOKSELECT    = 0x2D4A;
+const word CRC_ADDRESSBOOKDELETE    = 0x70D1;
+const word CRC_ADDRESSBOOKPACK      = 0x2C5C;
 
 const word CRC_HEADERADDRESSBOOK    = 0x76FC;
 const word CRC_HEADERLOOKUP         = 0x64F2;
diff --git a/golded3/gectrl.cpp b/golded3/gectrl.cpp
index 32bb52b..4dbd354 100644
--- a/golded3/gectrl.cpp
+++ b/golded3/gectrl.cpp
@@ -544,8 +544,8 @@ void DoKludges(int mode, GMsg* msg, bool attronly) {
       }
     }
 
-    if(AA->isnet()) {
-      if(*msg->ito and not AA->isinternet()) {
+    if((mode != MODE_CHANGE) and AA->isnet() and not AA->isinternet()) {
+      if(*msg->ito) {
         sprintf(buf, "To: %s\r", msg->ito);
         line = AddKludge(line, buf);
       }
diff --git a/golded3/ged2.ico b/golded3/ged2.ico
index 276b9dd..2f28f20 100644
Binary files a/golded3/ged2.ico and b/golded3/ged2.ico differ
diff --git a/golded3/gemlst.cpp b/golded3/gemlst.cpp
index 923c06a..a38b932 100644
--- a/golded3/gemlst.cpp
+++ b/golded3/gemlst.cpp
@@ -386,7 +386,11 @@ bool GMsgList::handle_key() {
           AA->Mark.Add(mlst[index].msgno);
         }
       }
-      goto listgotonext;
+      if(index < maximum_index)
+        cursor_down();
+      else
+        display_bar();
+      break;
 
     case KK_ListToggleBookMark:
       if(AA->bookmark == mlst[index].msgno) {
diff --git a/golded3/golded3.cpp b/golded3/golded3.cpp
index 34c0207..af6b004 100644
--- a/golded3/golded3.cpp
+++ b/golded3/golded3.cpp
@@ -39,7 +39,7 @@ int         __gver_minor__    = __GVER_MINOR__; \
 int         __gver_release__  = __GVER_RELEASE__; \
 const char* __gver_longpid__  = __GVER_PID__(,); \
 const char* __gver_shortpid__ = __GVER_PID__(,SHORT); \
-const char* __gver_ver__      = __GVER_VER__(__GVER_MAJOR__,__GVER_MINOR__,__GVER_RELEASE__);
+const char* __gver_ver__      = __GVER_VER__(__GVER_MAJOR__,__GVER_MINOR__,__GVER_RELEASE__); \
 const char* __gver_shortver__ = __GVER_SVER__(__GVER_MAJOR__,__GVER_MINOR__,__GVER_RELEASE__);