--- a/messagingapp/msgui/unifiededitor/src/msgunieditoraudiowidget.cpp	Tue Jul 06 14:12:40 2010 +0300
+++ b/messagingapp/msgui/unifiededitor/src/msgunieditoraudiowidget.cpp	Wed Aug 18 09:45:25 2010 +0300
@@ -37,8 +37,7 @@
 // @see header file
 //----------------------------------------------------------------------------
 MsgUniFiedEditorAudioWidget::MsgUniFiedEditorAudioWidget(QGraphicsItem *parent) :
-HbPushButton(parent),
-mEditorUtils(0)
+HbPushButton(parent), mEditorUtils(0), mValidMediaDuration(true)
 {
     connect(this, SIGNAL(clicked()), this, SLOT(handleShortTap()));
     connect(this, SIGNAL(longPress(QPointF)), this, SLOT(handleLongTap(QPointF)));
@@ -64,11 +63,32 @@
     QFileInfo fileInfo(mMediaPath);
     this->setText(fileInfo.baseName());    
     MsgMediaUtil mediaUtil;
-    this->setAdditionalText(mediaUtil.mediaDuration(mMediaPath));
+    QString mediaDuration(mediaUtil.mediaDuration(mMediaPath));
+    if (mediaDuration.isEmpty()) {
+        mValidMediaDuration = false;
+    }
+    else {
+        mValidMediaDuration = true;
+        this->setAdditionalText(mediaDuration);
+    }
     this->setTextAlignment(Qt::AlignVCenter | Qt::AlignLeft);
 }
 
 //----------------------------------------------------------------------------
+// MsgUniFiedEditorAudioWidget::setStretched
+// @see header file
+//----------------------------------------------------------------------------
+void MsgUniFiedEditorAudioWidget::setStretched(bool stretched)
+{
+    if (mValidMediaDuration) {
+        HbPushButton::setStretched(stretched);
+    }
+    else {
+        HbPushButton::setStretched(true);
+    }
+}
+
+//----------------------------------------------------------------------------
 // MsgUniFiedEditorAudioWidget::handleShortTap
 // @see header file
 //----------------------------------------------------------------------------