diff -r a9c7e5670d17 -r c6838af47512 mobilemessaging/smsmtm/servermtm/src/SMSSOUTB.CPP --- a/mobilemessaging/smsmtm/servermtm/src/SMSSOUTB.CPP Mon Mar 15 12:40:06 2010 +0200 +++ b/mobilemessaging/smsmtm/servermtm/src/SMSSOUTB.CPP Wed Mar 31 21:25:02 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -23,6 +23,7 @@ #include #include #include +#include #include "SMSSendSession.h" #include "SMSSPAN.H" @@ -210,7 +211,15 @@ { if (iCurrentMessage) { - ReScheduleFailedMessageL(); + if( (iProgress.iError == KErrGsmSMSShortMessageTransferRejected) || (iProgress.iError == KErrGsmSMSInvalidMandatoryInformation) || (iProgress.iError == KErrGsmSMSUnidentifiedSubscriber) || + (iProgress.iError == KErrGsmSMSUnknownSubscriber) || (iProgress.iError == KErrGsmSMSNetworkOutOfOrder) ) + { + DoComplete(iProgress.iError); + } + else + { + ReScheduleFailedMessageL(); + } } else {