diff --git a/resources/languages/resources.properties b/resources/languages/resources.properties
index abe4a1aeb..df45b1257 100644
--- a/resources/languages/resources.properties
+++ b/resources/languages/resources.properties
@@ -255,7 +255,8 @@ service.gui.MOVE_CONTACT_ERROR=&Contact cannot be moved
 service.gui.MSG_DELIVERY_FAILURE=The above message could not be delivered
 service.gui.MSG_DELIVERY_NOT_SUPPORTED=The protocol you are using doesn't support offline messages. You could try to reach this contact through another protocol or wait until he/she becomes online.
 service.gui.MSG_DELIVERY_INTERNAL_ERROR=An internal error occured. This is most probably a bug. Please report it here: http://www.sip-communicator.org/index.php/Development/BugsAndIssues. Server returned error: {0}
-service.gui.MSG_DELIVERY_UNKNOWN_ERROR=Your message could not be delivered due to the following problem: {0}.
+service.gui.MSG_DELIVERY_ERROR=Your message could not be delivered due to the following problem: {0}.
+service.gui.MSG_DELIVERY_UNKNOWN_ERROR=Unknown error has occured while delivering your message.
 service.gui.MSG_NOT_DELIVERED=A network problem occured. Please check your network configuration and try again. Server returned error: {0}.
 service.gui.MSG_NOT_POSSIBLE=Messaging is not possible for this contact (it is not supported by the protocol)
 service.gui.MSG_RECEIVED={0} wrote
@@ -382,7 +383,6 @@ service.gui.USER_EXISTS_ERROR=This user already exists on the selected network.
 service.gui.USERNAME_NULL=Please fill the name of your account.
 service.gui.ACCOUNT_CREATION_FAILED=We failed to create your account due to the following error: {0}
 service.gui.UNKNOWN=Unknown user
-service.gui.MSG_DELIVERY_UNKNOWN_ERROR=Unknown error has occured while delivering your message.
 service.gui.UNREGISTERED_MESSAGE=Unable to connect the following account: User name: {0}, Server name: {1}. You are currently offline.
 service.gui.VIEW=&View
 service.gui.VIEW_HISTORY=View &history
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
index 4cbf2e76c..68e56320a 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
@@ -1072,7 +1072,7 @@ public void catchException(Throwable ex)
                     addErrorMessage(
                         chatSession.getCurrentChatTransport().getName(),
                         GuiActivator.getResources().getI18NString(
-                            "service.gui.MSG_DELIVERY_UNKNOWN_ERROR",
+                            "service.gui.MSG_DELIVERY_ERROR",
                             new String[]{ex.getMessage()}));
                 }
             }
@@ -1267,7 +1267,7 @@ protected void sendInstantMessage()
             this.addErrorMessage(
                 chatSession.getCurrentChatTransport().getName(),
                 GuiActivator.getResources().getI18NString(
-                    "service.gui.MSG_DELIVERY_UNKNOWN_ERROR",
+                    "service.gui.MSG_DELIVERY_ERROR",
                     new String[]{ex.getMessage()}));
         }
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/SendSmsDialog.java b/src/net/java/sip/communicator/impl/gui/main/chat/SendSmsDialog.java
index 706744a48..b71e41c9c 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/SendSmsDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/SendSmsDialog.java
@@ -159,7 +159,7 @@ private void sendSmsMessage(String phoneNumber, String message)
             chatPanel.addErrorMessage(
                 phoneNumber,
                 GuiActivator.getResources()
-                    .getI18NString("service.gui.MSG_DELIVERY_UNKNOWN_ERROR",
+                    .getI18NString("service.gui.MSG_DELIVERY_ERROR",
                     new String[]{ex.getMessage()}));
         }
         
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPane.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPane.java
index 2b48dce39..bd168f4e1 100755
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPane.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPane.java
@@ -404,7 +404,7 @@ else if (evt.getErrorCode()
         else
         {
             errorMsg = GuiActivator.getResources().getI18NString(
-                    "service.gui.MSG_DELIVERY_UNKNOWN_ERROR",
+                    "service.gui.MSG_DELIVERY_ERROR",
                     new String[]{evt.getReason()});
         }