diff --git a/retroshare-gui/src/gui/PhotoShare/AlbumDialog.cpp b/retroshare-gui/src/gui/PhotoShare/AlbumDialog.cpp
index 7d3248ffa..8897d9f5f 100644
--- a/retroshare-gui/src/gui/PhotoShare/AlbumDialog.cpp
+++ b/retroshare-gui/src/gui/PhotoShare/AlbumDialog.cpp
@@ -34,7 +34,7 @@ void AlbumDialog::setUp()
     ui->lineEdit_Title->setText(QString::fromStdString(mAlbum.mMeta.mGroupName));
     ui->lineEdit_Caption->setText(QString::fromStdString(mAlbum.mCaption));
     ui->lineEdit_Category->setText(QString::fromStdString(mAlbum.mCategory));
-    ui->lineEdit_Identity->setText(QString::fromStdString(mAlbum.mMeta.mAuthorId));
+    ui->lineEdit_Identity->setText(QString::fromStdString(mAlbum.mMeta.mAuthorId.toStdString()));
     ui->lineEdit_Where->setText(QString::fromStdString(mAlbum.mWhere));
     ui->textEdit_description->setText(QString::fromStdString(mAlbum.mDescription));
 
diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoDialog.cpp b/retroshare-gui/src/gui/PhotoShare/PhotoDialog.cpp
index fbec92ef5..ff2cb3f81 100644
--- a/retroshare-gui/src/gui/PhotoShare/PhotoDialog.cpp
+++ b/retroshare-gui/src/gui/PhotoShare/PhotoDialog.cpp
@@ -207,7 +207,7 @@ void PhotoDialog::acknowledgeComment(uint32_t token)
     RsGxsGrpMsgIdPair msgId;
     mRsPhoto->acknowledgeMsg(token, msgId);
 
-    if(msgId.first.empty() || msgId.second.empty()){
+    if(msgId.first.isNull() || msgId.second.isNull()){
 
     }else
     {
diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoItem.cpp b/retroshare-gui/src/gui/PhotoShare/PhotoItem.cpp
index fc8be5a69..e88a33a1c 100644
--- a/retroshare-gui/src/gui/PhotoShare/PhotoItem.cpp
+++ b/retroshare-gui/src/gui/PhotoShare/PhotoItem.cpp
@@ -45,7 +45,7 @@ PhotoItem::PhotoItem(PhotoShareItemHolder *holder, const QString& path, QWidget
     connect(ui->lineEdit_Title, SIGNAL(editingFinished()), this, SLOT(setTitle()));
     connect(ui->lineEdit_PhotoGrapher, SIGNAL(editingFinished()), this, SLOT(setPhotoGrapher()));
 
-    ui->idChooser->loadIds(0, "");
+    ui->idChooser->loadIds(0, RsGxsId());
 
 }
 
diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoShare.cpp b/retroshare-gui/src/gui/PhotoShare/PhotoShare.cpp
index 8ea3ad861..9a6b1b429 100644
--- a/retroshare-gui/src/gui/PhotoShare/PhotoShare.cpp
+++ b/retroshare-gui/src/gui/PhotoShare/PhotoShare.cpp
@@ -171,7 +171,7 @@ void PhotoShare::checkUpdate()
         if (rsPhoto->updated())
         {
                 //insertAlbums();
-            std::list<std::string> grpIds;
+            std::list<RsGxsGroupId> grpIds;
             rsPhoto->groupsChanged(grpIds);
             if(!grpIds.empty())
             {
@@ -449,7 +449,7 @@ void PhotoShare::updatePhotos()
 /**************************** Request / Response Filling of Data ************************/
 
 
-void PhotoShare::requestAlbumList(std::list<std::string>& ids)
+void PhotoShare::requestAlbumList(std::list<RsGxsGroupId>& ids)
 {
         RsTokReqOptions opts;
         opts.mReqType = GXS_REQUEST_TYPE_GROUP_IDS;
@@ -472,12 +472,12 @@ void PhotoShare::loadAlbumList(const uint32_t &token)
         std::cerr << "PhotoShare::loadAlbumList()";
         std::cerr << std::endl;
 
-        std::list<std::string> albumIds;
+        std::list<RsGxsGroupId> albumIds;
         rsPhoto->getGroupList(token, albumIds);
 
         requestAlbumData(albumIds);
 
-        std::list<std::string>::iterator it;
+        std::list<RsGxsGroupId>::iterator it;
         for(it = albumIds.begin(); it != albumIds.end(); it++)
         {
                 requestPhotoList(*it);
@@ -525,7 +525,7 @@ bool PhotoShare::loadAlbumData(const uint32_t &token)
 }
 
 
-void PhotoShare::requestPhotoList(const std::string &albumId)
+void PhotoShare::requestPhotoList(const RsGxsGroupId &albumId)
 {
 
     std::list<RsGxsGroupId> grpIds;
@@ -543,7 +543,7 @@ void PhotoShare::acknowledgeGroup(const uint32_t &token)
     RsGxsGroupId grpId;
     rsPhoto->acknowledgeGrp(token, grpId);
 
-    if(!grpId.empty())
+    if(!grpId.isNull())
     {
         std::list<RsGxsGroupId> grpIds;
         grpIds.push_back(grpId);
diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoShare.h b/retroshare-gui/src/gui/PhotoShare/PhotoShare.h
index e0de61063..557ee7fe1 100644
--- a/retroshare-gui/src/gui/PhotoShare/PhotoShare.h
+++ b/retroshare-gui/src/gui/PhotoShare/PhotoShare.h
@@ -44,7 +44,7 @@ private slots:
 
 private:
         /* Request Response Functions for loading data */
-        void requestAlbumList(std::list<std::string>& ids);
+        void requestAlbumList(std::list<RsGxsGroupId> &ids);
         void requestAlbumData(std::list<RsGxsGroupId> &ids);
 
         /*!
@@ -52,7 +52,7 @@ private:
          */
         void requestAlbumData();
         void requestPhotoList(GxsMsgReq &albumIds);
-        void requestPhotoList(const std::string &albumId);
+        void requestPhotoList(const RsGxsGroupId &albumId);
         void requestPhotoData(GxsMsgReq &photoIds);
         void requestPhotoData(const std::list<RsGxsGroupId> &grpIds);
 
diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.cpp b/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.cpp
index e3997e0a6..1d4243ad6 100644
--- a/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.cpp
+++ b/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.cpp
@@ -53,7 +53,7 @@ PhotoSlideShow::PhotoSlideShow(const RsPhotoAlbum& album, QWidget *parent)
 
 PhotoSlideShow::~PhotoSlideShow(){
 
-    std::map<std::string, RsPhotoPhoto *>::iterator mit = mPhotos.begin();
+    std::map<RsGxsMessageId, RsPhotoPhoto *>::iterator mit = mPhotos.begin();
 
     for(; mit != mPhotos.end(); mit++)
     {
@@ -153,10 +153,10 @@ void PhotoSlideShow::loadImage()
 	/* get the image */
 	int i = 0;
 	bool found = false;
-	std::string msgId;
+    RsGxsMessageId msgId;
 
 	//std::map<std::string, RsPhotoPhoto *>::iterator it;
-	std::map<int, std::string>::iterator it;
+    std::map<int, RsGxsMessageId>::iterator it;
 	for(it = mPhotoOrder.begin(); it != mPhotoOrder.end(); it++, i++)
 	{
 		if (i == mImageIdx)
diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.h b/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.h
index 23183035d..5b0bf4452 100644
--- a/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.h
+++ b/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.h
@@ -59,8 +59,8 @@ private:
 
 private:
 
-	std::map<std::string, RsPhotoPhoto *> mPhotos;
-	std::map<int, std::string> mPhotoOrder;
+    std::map<RsGxsMessageId, RsPhotoPhoto *> mPhotos;
+    std::map<int, RsGxsMessageId> mPhotoOrder;
 
 	bool mRunning;
 	int mImageIdx;