diff -r b79ee333c41d -r bc161388e3ce profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileFileListSettingItem.cpp
--- a/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileFileListSettingItem.cpp	Mon Mar 15 12:40:33 2010 +0200
+++ b/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfileFileListSettingItem.cpp	Wed Mar 31 21:31:25 2010 +0300
@@ -30,6 +30,7 @@
 #include <ProfileSettingsView.rsg>
 #include <data_caging_path_literals.hrh>
 #include <CLFContentListing.hrh>	// For TCLFMediaType::ECLFMediaTypeVideo
+#include <featdiscovery.h> // CFeatureDiscovery
 
 // for mediafilelist
 #include <mediafilelist.h>
@@ -193,9 +194,13 @@
         }
        
     // Size limit for voice call tone files
+    // Messaging tone size is also limited if the
+    // "FF_LIMITED_MESSAGE_AND_ALARM_TONE_SIZE" feature flag is enabled
     if ( id == EProfileSettingRingingToneId      ||
          id == EProfileSettingRingingToneLine1Id ||
-         id == EProfileSettingRingingToneLine2Id )
+         id == EProfileSettingRingingToneLine2Id ||
+         ( id == EProfileSettingMessageAlertToneId &&
+           CFeatureDiscovery::IsFeatureSupportedL( KFeatureIdFfLimitedMessageAndAlarmToneSize ) ) )
         {
         TInt sizeLimitKB = 0;
         CRepository* cenrep = CRepository::NewL( KCRUidProfileEngine );
@@ -204,7 +209,6 @@
         CleanupStack::PopAndDestroy(); // cenrep
 
         list->SetAttrL( CMediaFileList::EAttrFileSize, sizeLimitKB );
-        
 
         }