diff --git a/Makefile.am b/Makefile.am
index 189930c4e..6fe8624be 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,7 @@ BUILT_SOURCES = kmmainwin.moc kmfolderdia.moc kmfolder.moc \
 		kmimemagic.moc kmacctpop.moc kmaccount.moc \
 		kmfolderseldlg.moc kmfilterdlg.moc kpgp.moc \
 		kmaddrbookdlg.moc kmiostatusdlg.moc \
-		kmnewiostatus.cpp kmnewiostatuswdg.cpp
+		kmnewiostatus.moc kmnewiostatuswdg.moc
 
 CLEAN_FILES = $(BUILT_SOURCES)
 
@@ -161,9 +161,9 @@ kmiostatusdlg.moc: kmiostatusdlg.h
 	$(MOC) kmiostatusdlg.h -o kmiostatusdlg.moc
 
 kmnewiostatuswdg.cpp: kmnewiostatuswdg.moc
-kmnewiostatuswdg.cpp: kmnewiostatuswdg.h
+kmnewiostatuswdg.moc: kmnewiostatuswdg.h
 	$(MOC) kmnewiostatuswdg.h -o kmnewiostatuswdg.moc
 
 kmnewiostatus.cpp: kmnewiostatus.moc
-kmnewiostatus.cpp: kmnewiostatus.h
+kmnewiostatus.moc: kmnewiostatus.h
 	$(MOC) kmnewiostatus.h -o kmnewiostatus.moc
diff --git a/kmcomposewin.cpp b/kmcomposewin.cpp
index cbf0b6fa8..595cc3a87 100644
--- a/kmcomposewin.cpp
+++ b/kmcomposewin.cpp
@@ -506,12 +506,12 @@ void KMComposeWin::setupToolBar(void)
 			SIGNAL(clicked()),this,
 			SLOT(slotCopyText()),TRUE,"Undo last change");
 #endif
-  mToolBar->insertButton(loader->loadIcon("editcopy.xpm"),3,
-			SIGNAL(clicked()),this,
-			SLOT(slotCopy()),TRUE,i18n("Copy selection"));
   mToolBar->insertButton(loader->loadIcon("editcut.xpm"),4,
 			SIGNAL(clicked()),this,
 			SLOT(slotCut()),TRUE,i18n("Cut selection"));
+  mToolBar->insertButton(loader->loadIcon("editcopy.xpm"),3,
+			SIGNAL(clicked()),this,
+			SLOT(slotCopy()),TRUE,i18n("Copy selection"));
   mToolBar->insertButton(loader->loadIcon("editpaste.xpm"),5,
 			SIGNAL(clicked()),this,
 			SLOT(slotPaste()),TRUE,i18n("Paste clipboard contents"));
@@ -549,9 +549,9 @@ void KMComposeWin::setupStatusBar(void)
 {
   mStatusBar = new KStatusBar(this);
   mStatusBar->setInsertOrder(KStatusBar::RightToLeft);
-  mStatusBar->insertItem("Column:     ",2);
-  mStatusBar->insertItem("Line:     ",1);
-  mStatusBar->insertItem("Status:",0);
+  mStatusBar->insertItem(QString(i18n("Column"))+":     ",2);
+  mStatusBar->insertItem(QString(i18n("Line"))+":     ",1);
+  mStatusBar->insertItem("  ",0);
   setStatusBar(mStatusBar);
 }
 
@@ -561,9 +561,9 @@ void KMComposeWin::updateCursorPosition() {
   QString temp;
   line = mEditor->currentLine();
   col = mEditor->currentColumn();
-  temp.sprintf("Line: %i",(line+1));
+  temp.sprintf("%s: %i", i18n("Line"), (line+1));
   mStatusBar->changeItem(temp,1);
-  temp.sprintf("Column: %i",(col+1));
+  temp.sprintf("%s: %i", i18n("Column"), (col+1));
   mStatusBar->changeItem(temp,2);
 
 }
diff --git a/kmversion.h b/kmversion.h
index e186e7285..ce35554c3 100644
--- a/kmversion.h
+++ b/kmversion.h
@@ -3,6 +3,6 @@
 #ifndef kmversion_h
 #define kmversion_h
 
-#define KMAIL_VERSION "0.5.9"
+#define KMAIL_VERSION "0.6.0"
 
 #endif /*kmversion_h*/
diff --git a/main.cpp b/main.cpp
index e18e8fa08..493fc259b 100644
--- a/main.cpp
+++ b/main.cpp
@@ -68,7 +68,7 @@ static void signalHandler(int sigId);
 static void testDir(const char *_name);
 static void transferMail(void);
 static void initFolders(KConfig* cfg);
-static void init(int argc, char *argv[]);
+static void init(int& argc, char *argv[]);
 static void cleanup(void);
 static void setSignalHandler(void (*handler)(int));
 static void recoverDeadLetters(void);
@@ -114,8 +114,7 @@ static void signalHandler(int sigId)
 {
   QWidget* win;
 
-  fprintf(stderr, "*** KMail got signal %d: %s\n", sigId,
-	  strsignal(sigId));
+  fprintf(stderr, "*** KMail got signal %d\n", sigId);
 
   // try to cleanup all windows
   while (windowList->first() != NULL)
@@ -262,7 +261,7 @@ static void initFolders(KConfig* cfg)
 
 
 //-----------------------------------------------------------------------------
-static void init(int argc, char *argv[])
+static void init(int& argc, char *argv[])
 {
   QString  acctPath, foldersPath;
   KConfig* cfg;