diff --git a/src/gallery/qgalleryabstractrequest.cpp b/src/gallery/qgalleryabstractrequest.cpp
diff --git a/src/gallery/simulator/qsimulatorgalleryresultset.cpp b/src/gallery/simulator/qsimulatorgalleryresultset.cpp
index 4041758..405f5a0 100644
--- a/src/gallery/simulator/qsimulatorgalleryresultset.cpp
+++ b/src/gallery/simulator/qsimulatorgalleryresultset.cpp
@@ -42,7 +42,6 @@

 #include "qdocumentgallery.h"

-#include <QtCore/QFileInfo>
 #include <QtCore/QDateTime>

 QTM_BEGIN_NAMESPACE
@@ -185,15 +184,16 @@ bool QSimulatorGalleryResultSet::isValid() const

 QVariant QSimulatorGalleryResultSet::itemId() const
 {
-    if (valid)
-        return QFileInfo(filePath).absoluteFilePath();
+    if (valid) {
+        return currentFileInfo();
+    }
     return QVariant();
 }

 QUrl QSimulatorGalleryResultSet::itemUrl() const
 {
     if (connection) {
-        QString data = connection->galleryData().images.at(mCurrentIndex).fileName;
+        QString data = currentFileInfo().absoluteFilePath();
         return QUrl::fromLocalFile(data);
     }
     return QUrl();
@@ -206,9 +206,9 @@ QString QSimulatorGalleryResultSet::itemType() const

 QVariant QSimulatorGalleryResultSet::metaData(int key) const
 {
-    QFileInfo info(filePath);
+    QFileInfo info = currentFileInfo();
     if (key == Utility::FileName)
-        return info.fileName();
+        return info.absoluteFilePath();
     else if (key == Utility::FilePath)
         return info.absolutePath();
     else if (key == Utility::FileExtension)
@@ -252,5 +252,13 @@ bool QSimulatorGalleryResultSet::fetch(int index)
     return true;
 }

+QFileInfo QSimulatorGalleryResultSet::currentFileInfo() const
+{
+    if (connection)
+        return QFileInfo(connection->galleryData().images.at(mCurrentIndex).fileName);
+    else
+        return QFileInfo(filePath);
+}
+
 #include "moc_qsimulatorgalleryresultset_p.cpp"
 QTM_END_NAMESPACE
diff --git a/src/gallery/simulator/qsimulatorgalleryresultset_p.h b/src/gallery/simulator/qsimulatorgalleryresultset_p.h
index 8577bad..1166f98 100644
--- a/src/gallery/simulator/qsimulatorgalleryresultset_p.h
+++ b/src/gallery/simulator/qsimulatorgalleryresultset_p.h
@@ -47,6 +47,7 @@
 #include "qgalleryqueryrequest.h"
 #include "qgalleryitemrequest.h"
 #include <QtCore/QObject>
+#include <QtCore/QFileInfo>
 #include <QtGui/QImage>

 QTM_BEGIN_NAMESPACE
@@ -81,6 +82,8 @@ signals:
 public slots:

 private:
+    QFileInfo getCurrentFileInfo() const;
+
     Simulator::DocGalleryConnection* connection;
     QGalleryQueryRequest* queryRequest;
     QGalleryItemRequest* itemRequest;