diff --git a/callback.cpp b/callback.cpp
index 85993d03f..40134e452 100644
--- a/callback.cpp
+++ b/callback.cpp
@@ -75,10 +75,10 @@ QString Callback::askForTransport( bool nullIdentity ) const
 
   QString text;
   if ( nullIdentity )
-    text = i18n( "<qt>The receiver of this invitation doesn't match any of your identities.<br>"
+    text = i18n( "<qt>The receiver of this invitation does not match any of your identities.<br>"
                  "Please select the transport which should be used to send your reply.</qt>" );
   else
-    text = i18n( "<qt>The identity matching the receiver of this invitation doesn't have an "
+    text = i18n( "<qt>The identity matching the receiver of this invitation does not have an "
                  "associated transport configured.<br>"
                  "Please select the transport which should be used to send your reply.</qt>");
   bool ok;
diff --git a/kmail.kcfg.cmake b/kmail.kcfg.cmake
index c2c3505fb..41e47902b 100644
--- a/kmail.kcfg.cmake
+++ b/kmail.kcfg.cmake
@@ -152,7 +152,7 @@
       <entry name="MaildirFilenameSeparator" type="String">
         <label>
           The filename separator for maildir files "uniq:info" - see the original maildir specification at http://cr.yp.to/proto/maildir.html
-          The default depends on the OS we're currently on. WIN='!', all others ':'.
+          The default depends on the current operating system. WIN='!', all others ':'.
         </label>
         <default>${MAILDIR_FILENAME_SEPARATOR}</default>
       </entry>
@@ -307,7 +307,7 @@
       </entry>
       <entry name="AllowSemicolonAsAddressSeparator" type="Bool">
         <default>${ALLOW_SEMICOLON_AS_ADDRESS_SEPARATOR_DEFAULT}</default>
-        <label>Allow the semicolon charactor (';') to be used as separator in the message composer.</label>
+        <label>Allow the semicolon character (';') to be used as separator in the message composer.</label>
       </entry>
       <entry name="ForceReplyCharset" type="Bool" key="force-reply-charset">
         <label>Keep original charset when replying or forwarding if possible</label>
diff --git a/kmail.notifyrc b/kmail.notifyrc
index e339c5421..3e54e93b5 100644
--- a/kmail.notifyrc
+++ b/kmail.notifyrc
@@ -61,6 +61,7 @@ Comment[zh_TW]=KMail 郵件軟體
 
 [Event/mail-check-error]
 Name=Error While Checking Mail
+Name[en_GB]=Error While Checking Mail
 Name[es]=Error al comprobar el correo
 Name[gl]=Produciuse un erro ao comprobar o correo
 Name[nb]=Feil under sjekking av e-post
@@ -75,6 +76,7 @@ Name[uk]=Помилка під час спроби отримання пошти
 Name[x-test]=xxError While Checking Mailxx
 Name[zh_TW]=檢查郵件時發生錯誤
 Comment=There was an error while checking for new mail
+Comment[en_GB]=There was an error while checking for new mail
 Comment[es]=Ha ocurrido un error mientras se comprobaba el correo nuevo
 Comment[gl]=Aconteceu un erro cando se comprobaba o correo novo
 Comment[nb]=Det oppsto en feil mens det ble sett etter ny e-post
diff --git a/kmfilteraction.cpp b/kmfilteraction.cpp
index 519bcb7b5..169bbb2a1 100644
--- a/kmfilteraction.cpp
+++ b/kmfilteraction.cpp
@@ -2239,11 +2239,11 @@ KMFilterAction::ReturnCode KMFilterActionAddToAddressBook::process( KMMessage* m
     }
 
     if ( !ab->save( ticket ) ) {
-      ab->error( i18n( "Can't save new addresses to address book." ) );
+      ab->error( i18n( "Cannot save new addresses to address book." ) );
       return ErrorButGoOn;
     }
   } else {
-    ab->error( i18n( "Can't save to address book. Address book is locked." ) );
+    ab->error( i18n( "Cannot save to address book: address book is locked." ) );
     return ErrorButGoOn;
   }
 
@@ -2267,13 +2267,13 @@ QWidget* KMFilterActionAddToAddressBook::createParamWidget( QWidget* parent ) co
   le->setObjectName( "ledit" );
   gridlayout->addWidget( le, 0, 2 );
 
-  l = new QLabel( i18n( "in addressbook" ), w );
+  l = new QLabel( i18n( "in address book" ), w );
   gridlayout->addWidget( l, 1, 1 );
 
   KComboBox *cbAdressBook = new KComboBox( w );
   cbAdressBook->setObjectName( "AddressBookCombo" );
-  cbAdressBook->setToolTip( i18n( "<p>This defines the preferred addressbook.<br />"
-        "If it is not accessible, the filter will fallback to the default addressbook.</p>" ) );
+  cbAdressBook->setToolTip( i18n( "<p>This defines the preferred address book.<br />"
+        "If it is not accessible, the filter will fallback to the default address book.</p>" ) );
   cbAdressBook->setInsertPolicy( QComboBox::InsertAtBottom );
   gridlayout->addWidget( cbAdressBook, 1, 2 );
 
diff --git a/kmfolderdialog.cpp b/kmfolderdialog.cpp
index b9475cf39..e858b1fa7 100644
--- a/kmfolderdialog.cpp
+++ b/kmfolderdialog.cpp
@@ -442,8 +442,8 @@ KMail::FolderDialogGeneralTab::FolderDialogGeneralTab( KMFolderDialog* dlg,
   mHideInSelectionDialogCheckBox =
       new QCheckBox( i18n( "Hide this folder in the folder selection dialog" ), this );
   mHideInSelectionDialogCheckBox->setWhatsThis(
-                  i18nc( "@info:whatsthis", "Check this option if you do not want that this folder "
-                         "is shown in the folder selection dialogs, like the <interface>"
+                  i18nc( "@info:whatsthis", "Check this option if you do not want this folder "
+                         "to be shown in folder selection dialogs, such as the <interface>"
                           "Jump to Folder</interface> dialog." ) );
   hbl->addWidget( mHideInSelectionDialogCheckBox );
   hbl->addStretch( 1 );
diff --git a/kmmessage.cpp b/kmmessage.cpp
index 6e214eba9..cfac04da8 100644
--- a/kmmessage.cpp
+++ b/kmmessage.cpp
@@ -618,8 +618,10 @@ KMMessage* KMMessage::createReply( ReplyStrategy replyStrategy,
       toStr = headerField( "Mail-Followup-To" );
     }
     else if ( !replyToStr.isEmpty() ) {
-      // assume a Reply-To header mangling mailing list
       toStr = replyToStr;
+      // use the ReplyAll template only when it's a reply to a mailing list
+      if ( mailingListAddresses.isEmpty() )
+        replyAll = false;
     }
     else if ( !mailingListAddresses.isEmpty() ) {
       toStr = mailingListAddresses[0];
diff --git a/ui/accountspagereceivingtab.ui b/ui/accountspagereceivingtab.ui
index 2488bdbd5..2a05e8575 100644
--- a/ui/accountspagereceivingtab.ui
+++ b/ui/accountspagereceivingtab.ui
@@ -122,7 +122,7 @@
            </sizepolicy>
           </property>
           <property name="toolTip">
-           <string>Show for each  folder the number of newly arrived messages</string>
+           <string>Show for each folder the number of newly arrived messages</string>
           </property>
           <property name="text">
            <string>Deta&amp;iled new mail notification</string>
diff --git a/ui/imapsettings.ui b/ui/imapsettings.ui
index 8c481cc71..b1eb7bf92 100644
--- a/ui/imapsettings.ui
+++ b/ui/imapsettings.ui
@@ -258,7 +258,7 @@ However, if KWallet is not available, the password will be stored in KMail's con
        <item>
         <widget class="QCheckBox" name="subscribedFoldersCheck">
          <property name="text">
-          <string>Show only serverside s&amp;ubscribed folders</string>
+          <string>Show only server-side s&amp;ubscribed folders</string>
          </property>
         </widget>
        </item>
diff --git a/util.cpp b/util.cpp
index bf0a46c69..a9b8918a7 100644
--- a/util.cpp
+++ b/util.cpp
@@ -140,7 +140,7 @@ bool KMail::Util::validateAddresses( QWidget *parent, const QString &addresses )
     KPIMUtils::isValidAddressList( StringUtil::expandAliases( addresses,distributionListEmpty ),
                                    brokenAddress );
   if ( !distributionListEmpty.isEmpty() ) {
-    QString errorMsg = i18n( "Distribution list \"%1\" is empty. You can not use it.", distributionListEmpty.join( ", " ) );
+    QString errorMsg = i18n( "Distribution list \"%1\" is empty, it cannot be used.", distributionListEmpty.join( ", " ) );
     KMessageBox::sorry( parent , errorMsg, i18n("Invalid Email Address") );
     return false;
   }