--- a/src/hbwidgets/widgets/hbgroupbox.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/widgets/hbgroupbox.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -424,7 +424,7 @@
                 #ifdef HB_EFFECTS
                 HbEffect::start( d->mContentWidget, HB_GROUPBOX_TYPE, "collapse");  
                 #endif
-                HbStyle::setItemName( d->mContentWidget , "");
+                HbStyle::setItemName( d->mContentWidget , QString());
                 d->mContentWidget->setVisible(false);
             }
             else {
@@ -433,11 +433,11 @@
                 #endif
                 HbStyle::setItemName( d->mContentWidget , "contentwidget");
                 d->mContentWidget->setVisible(true);
+                repolish();
             }
             d->mHeadingWidget->updatePrimitives();
             emit toggled( d->collapsed );
         }
-        repolish();
     }    
 }
 
@@ -531,13 +531,8 @@
         d->mContentWidget->setContentWidget(widget);
         if(d->mHeadingWidget){
             d->setGroupBoxType(GroupBoxCollapsingContainer);
-        }else
+        }else{
             d->setGroupBoxType(GroupBoxRichLabel);
-
-        // collapsed property is set before setContentWidget
-        if ( d->mGroupBoxType == GroupBoxCollapsingContainer && d->collapsed ) {	
-            d->mContentWidget->setVisible(false);
-            HbStyle::setItemName( d->mContentWidget , "");
         }
         // update content widget primitve
         d->mContentWidget->updatePrimitives();