diff -r ba76fc04e6c2 -r 6b911d05207e phoneuis/bubblemanager2/bubblecore/src/bubbleimagewidget.h
--- a/phoneuis/bubblemanager2/bubblecore/src/bubbleimagewidget.h	Fri Jun 04 10:19:18 2010 +0100
+++ b/phoneuis/bubblemanager2/bubblecore/src/bubbleimagewidget.h	Wed Jun 23 18:12:20 2010 +0300
@@ -26,6 +26,8 @@
 class BubbleImageWidget : public HbWidget
     {
     Q_OBJECT
+
+    Q_PROPERTY(bool keepSquareShape READ keepSquareShape WRITE setKeepSquareShape)
     
 public:
     explicit BubbleImageWidget(
@@ -35,6 +37,9 @@
 
     void setImage(const QString& name);
 
+    bool keepSquareShape() const;
+    void setKeepSquareShape(bool keepSquare);
+
 protected slots:
     void imageLoaded(QString imageFileName);
 
@@ -44,10 +49,18 @@
         const QStyleOptionGraphicsItem* option,
         QWidget* widget);
 
+    QSizeF sizeHint(
+        Qt::SizeHint which,
+        const QSizeF & constraint) const;
+
+    void resizeEvent(QGraphicsSceneResizeEvent * event);
+
 private:
     BubbleImageManager& mImageManager;
     QString  mImageName;
     HbIconItem* mDefaultAvatar;
+    bool mKeepSquareShape;
+    int mUpdateCount;
     };
 
 #endif /* BUBBLEIMAGEWIDGET_H_ */