--- a/meetingrequest/mrgui/mrfieldbuilderplugin/src/cesmrrecurencefield.cpp	Tue May 25 12:23:16 2010 +0300
+++ b/meetingrequest/mrgui/mrfieldbuilderplugin/src/cesmrrecurencefield.cpp	Wed Jun 09 09:22:57 2010 +0300
@@ -72,9 +72,9 @@
     : iIndex( 0 )
     {
     FUNC_LOG;
-    
+
     iValidator = aValidator;
-    
+
     SetFieldId ( EESMRFieldRecurrence );
     SetFocusType( EESMRHighlightFocus );
     }
@@ -100,7 +100,7 @@
         MESMRFieldValidator* aValidator )
     {
     FUNC_LOG;
-    CESMRRecurenceField* self = 
+    CESMRRecurenceField* self =
         new( ELeave )CESMRRecurenceField( aValidator );
     CleanupStack::PushL( self );
     self->ConstructL();
@@ -118,9 +118,9 @@
     iRecurrence = CMRLabel::NewL();
     iRecurrence->SetParent( this );
     CESMRField::ConstructL( iRecurrence );
-    
+
     iRecurrence->SetTextL( KNullDesC() );
-    
+
     iFieldIcon = CMRImage::NewL( NMRBitmapManager::EMRBitmapRecurrence );
     iFieldIcon->SetParent( this );
     }
@@ -159,7 +159,7 @@
                 }
             }
         // resource reader
-        CleanupStack::PopAndDestroy(); // codescanner::cleanup 
+        CleanupStack::PopAndDestroy(); // codescanner::cleanup
         }
     else
         {
@@ -196,7 +196,7 @@
     	aCommand == EAknCmdOpen )
         {
     	HandleTactileFeedbackL();
-    	
+
         ExecuteRecurrenceQueryL();
         isUsed = ETrue;
         }
@@ -210,7 +210,7 @@
 void CESMRRecurenceField::ExecuteRecurrenceQueryL()
     {
     FUNC_LOG;
-    TInt ret = CESMRListQuery::ExecuteL( 
+    TInt ret = CESMRListQuery::ExecuteL(
             CESMRListQuery::EESMRRecurrenceQuery );
 
     if ( ret != KErrCancel )
@@ -311,31 +311,29 @@
     {
     FUNC_LOG;
     TRect rect = Rect();
-    
+
     TAknLayoutRect rowLayoutRect =
      NMRLayoutManager::GetFieldRowLayoutRect( rect, 1 );
     rect = rowLayoutRect.Rect();
-    
+
     TAknWindowComponentLayout iconLayout =
-     NMRLayoutManager::GetWindowComponentLayout( 
+     NMRLayoutManager::GetWindowComponentLayout(
              NMRLayoutManager::EMRLayoutTextEditorIcon );
     AknLayoutUtils::LayoutImage( iFieldIcon, rect, iconLayout );
-    
+
     TAknLayoutRect bgLayoutRect =
-     NMRLayoutManager::GetLayoutRect( 
+     NMRLayoutManager::GetLayoutRect(
              rect, NMRLayoutManager::EMRLayoutTextEditorBg );
     TRect bgRect( bgLayoutRect.Rect() );
     // Move focus rect so that it's relative to field's position.
     bgRect.Move( -Position() );
     SetFocusRect( bgRect );
-    
-    TAknLayoutText labelLayout = 
-     NMRLayoutManager::GetLayoutText( 
-             rect, NMRLayoutManager::EMRTextLayoutTextEditor );
-    iRecurrence->SetRect( labelLayout.TextRect() );
-    
-    // Setting font also for the field
-    iRecurrence->SetFont( labelLayout.Font() );
+
+    TAknTextComponentLayout editorLayout =
+            NMRLayoutManager::GetTextComponentLayout(
+                    NMRLayoutManager::EMRTextLayoutTextEditor );
+
+    AknLayoutUtils::LayoutLabel( iRecurrence, rect, editorLayout );
     }
 
 // ---------------------------------------------------------------------------
@@ -379,12 +377,12 @@
 // CESMRRecurenceField::SetContainerWindowL
 // ---------------------------------------------------------------------------
 //
-void CESMRRecurenceField::SetContainerWindowL( 
+void CESMRRecurenceField::SetContainerWindowL(
         const CCoeControl& aContainer )
     {
     CCoeControl::SetContainerWindowL( aContainer );
     iRecurrence->SetContainerWindowL( aContainer );
-    
+
     iRecurrence->SetParent( this );
     }