--- a/ipsservices/ipssossettings/src/ipssetdata.cpp	Wed Sep 15 11:52:37 2010 +0300
+++ b/ipsservices/ipssossettings/src/ipssetdata.cpp	Wed Oct 13 14:11:15 2010 +0300
@@ -179,22 +179,6 @@
     TMsvEntry mbox = IpsSetUtils::GetMailboxEntryL( aSession, aMailboxId );
     manager->LoadEmailSettingsL( mbox, *this );
     
-    // Update signature if needed
-    HBufC* body = NULL;
-    body = HBufC::NewL( iSignature->iRichText->DocumentLength() );
-    CleanupStack::PushL( body );
-    TPtr ptr = body->Des();
-    iSignature->iRichText->Extract( ptr );
-    TInt len = ptr.Length();
-    ptr.TrimLeft();
-    len-= ptr.Length();
-    if( len )
-        {
-        // Remove leading empty line from signature
-        iSignature->iRichText->DeleteL( 0, len );
-        }
-    CleanupStack::PopAndDestroy( body );
-    
     CleanupStack::PopAndDestroy( manager );
     manager = NULL;
     }
@@ -539,11 +523,11 @@
     ret.iIAP = 0;
     if ( aIncoming )
         {
-        if (iIncomingIapPref->SNAPDefined())
-            {
-            ret.iIAP = iIncomingIapPref->SNAPPreference();
-            }
-            
+		if (iIncomingIapPref->SNAPDefined())
+			{
+			ret.iIAP = iIncomingIapPref->SNAPPreference();
+			}
+			
         if ( iIncomingIapPref->NumberOfIAPs() > 0 )
             {
             ret = iIncomingIapPref->IAPPreference(0);
@@ -842,29 +826,7 @@
     {
     FUNC_LOG;
     iSignature->iRichText->Reset();
-    
-    if ( aSignature.Length() )
-        {
-        TChar firstChar = aSignature[0];
-        _LIT( KNewLines, "\r\n\x2028\x2029" );
-        _LIT( KIMSLineFeed, "\r\n");
-        if ( KNewLines().Locate( firstChar ) == KErrNotFound )
-            {
-            // First character is not a new line character. Insert one.
-            HBufC* body = NULL;
-            body = HBufC::NewL( aSignature.Length() + KIMSLineFeed().Length() );
-            CleanupStack::PushL( body );
-            TPtr ptr = body->Des();
-            ptr.Append( KIMSLineFeed );
-            ptr.Append( aSignature );
-            iSignature->iRichText->InsertL( 0, ptr );
-            CleanupStack::PopAndDestroy( body );
-            }
-        else
-            {
-            iSignature->iRichText->InsertL( 0, aSignature );
-            }
-        }
+    iSignature->iRichText->InsertL( 0, aSignature );
     }
 
 // ---------------------------------------------------------------------------
@@ -983,18 +945,18 @@
     CleanupStack::Pop( iOutgoingIapPref );
         
     if (aIncomingIap.SNAPDefined())
-        {
-        iIncomingIapPref->SetSNAPL(aIncomingIap.SNAPPreference());
-        }
+    	{
+		iIncomingIapPref->SetSNAPL(aIncomingIap.SNAPPreference());
+    	}
     else
-        {
-        iIncomingIapPref->AddIAPL( aIncomingIap.IAPPreference(0) );
-        }
+    	{
+    	iIncomingIapPref->AddIAPL( aIncomingIap.IAPPreference(0) );
+    	}
         
     if (aOutgoingIap.SNAPDefined())
-        {
-        iOutgoingIapPref->SetSNAPL(aOutgoingIap.SNAPPreference());
-        }
+      	{
+    	iOutgoingIapPref->SetSNAPL(aOutgoingIap.SNAPPreference());
+       	}
     else
     	{
     	iOutgoingIapPref->AddIAPL( aOutgoingIap.IAPPreference(0) );
@@ -1148,12 +1110,12 @@
         }
    //<cmail>
     else if ( iProtocol == KSenduiMtmPop3Uid && aDownloadControl == CIpsSetData::EHeadersPlus )
-        {
-        // fix for POP that has only 2 radio (IMAP has 3) 
-        // and the second should have value of EWholeBody instead of EHeadersPlus 
-        size = KIpsSetDataFullBodyAndAttas; 
-        }
-    //</cmail>
+    	{
+    	// fix for POP that has only 2 radio (IMAP has 3) 
+    	// and the second should have value of EWholeBody instead of EHeadersPlus 
+    	size = KIpsSetDataFullBodyAndAttas; 
+    	}
+    //</cmail>	
     else
         {
         size = aDownloadSize;