diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index 3134ad16a..1c8430a3c 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -281,6 +281,7 @@
         <file>images/newmsg.png</file>
         <file>images/no_avatar.png</file>
         <file>images/no_avatar_70.png</file>
+        <file>images/openimage.png</file>
         <file>images/pasterslink.png</file>
         <file>images/package_games1.png</file>
         <file>images/peerdetails_16x16.png</file>
@@ -300,6 +301,13 @@
         <file>images/greenled.png</file>
         <file>images/grayled.png</file>
         <file>images/yellowled.png</file>
+        <file>images/rate-1.png</file>
+        <file>images/rate-2.png</file>
+        <file>images/rate-3.png</file>
+        <file>images/rate-4.png</file>
+        <file>images/rate-5.png</file>
+        <file>images/rating.png</file>
+        <file>images/records.png</file>
         <file>images/records.png</file>
         <file>images/removefriend16.png</file>
         <file>images/replymail-pressed.png</file>
diff --git a/retroshare-gui/src/gui/images/lphoto.png b/retroshare-gui/src/gui/images/lphoto.png
index 415902e2e..c7bb01c11 100644
Binary files a/retroshare-gui/src/gui/images/lphoto.png and b/retroshare-gui/src/gui/images/lphoto.png differ
diff --git a/retroshare-gui/src/gui/images/openimage.png b/retroshare-gui/src/gui/images/openimage.png
new file mode 100644
index 000000000..d5c263c8b
Binary files /dev/null and b/retroshare-gui/src/gui/images/openimage.png differ
diff --git a/retroshare-gui/src/gui/images/rate-1.png b/retroshare-gui/src/gui/images/rate-1.png
new file mode 100644
index 000000000..b24fcc309
Binary files /dev/null and b/retroshare-gui/src/gui/images/rate-1.png differ
diff --git a/retroshare-gui/src/gui/images/rate-2.png b/retroshare-gui/src/gui/images/rate-2.png
new file mode 100644
index 000000000..22e0c855d
Binary files /dev/null and b/retroshare-gui/src/gui/images/rate-2.png differ
diff --git a/retroshare-gui/src/gui/images/rate-3.png b/retroshare-gui/src/gui/images/rate-3.png
new file mode 100644
index 000000000..759f1e415
Binary files /dev/null and b/retroshare-gui/src/gui/images/rate-3.png differ
diff --git a/retroshare-gui/src/gui/images/rate-4.png b/retroshare-gui/src/gui/images/rate-4.png
new file mode 100644
index 000000000..f6fb27ec6
Binary files /dev/null and b/retroshare-gui/src/gui/images/rate-4.png differ
diff --git a/retroshare-gui/src/gui/images/rate-5.png b/retroshare-gui/src/gui/images/rate-5.png
new file mode 100644
index 000000000..36b95cdbd
Binary files /dev/null and b/retroshare-gui/src/gui/images/rate-5.png differ
diff --git a/retroshare-gui/src/gui/images/rating.png b/retroshare-gui/src/gui/images/rating.png
new file mode 100644
index 000000000..6e47827b5
Binary files /dev/null and b/retroshare-gui/src/gui/images/rating.png differ
diff --git a/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp b/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp
index f8db869a9..f50242c08 100644
--- a/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp
+++ b/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp
@@ -157,13 +157,54 @@ void PhotoDialog::photoTreeWidgetCustomPopupMenu( QPoint point )
 
       QMenu contextMnu( this );
       QMouseEvent *mevent = new QMouseEvent( QEvent::MouseButtonPress, point, Qt::RightButton, Qt::RightButton, Qt::NoModifier );
+      
+      QAction *openphotoAct = new QAction(QIcon(":/images/openimage.png"), tr( "Open" ), this );
+      openphotoAct->setShortcut(Qt::CTRL + Qt::Key_O);
+      connect( openphotoAct , SIGNAL( triggered(QTreeWidgetItem * , int) ), this, SLOT( showPhoto( QTreeWidgetItem *, int ) ) );
 
-      QAction *rm = new QAction(QIcon(IMAGE_REMOVE), tr( "Remove" ), this );
-      connect( rm , SIGNAL( triggered() ), this, SLOT( removePhoto() ) );
+      QAction *removephotoAct = new QAction(QIcon(IMAGE_REMOVE), tr( "Remove" ), this );
+      removephotoAct->setShortcut(Qt::Key_Delete);
+      connect( removephotoAct , SIGNAL( triggered() ), this, SLOT( removePhoto() ) );
+      
+      rateExcellenAct = new QAction(QIcon(":/images/rate-5.png"), tr("Excellent"), this);
+      rateExcellenAct->setShortcut(Qt::CTRL + Qt::Key_5);
+      connect(rateExcellenAct, SIGNAL(triggered()), this, SLOT(rateExcellent()));
+      
+      rateGoodAct = new QAction(QIcon(":/images/rate-4.png"), tr("Good"), this);
+      rateGoodAct->setShortcut(Qt::CTRL + Qt::Key_4);
+      connect(rateGoodAct, SIGNAL(triggered()), this, SLOT(rateGood()));
+      
+      rateAverageAct = new QAction(QIcon(":/images/rate-3.png"), tr("Average"), this);
+      rateAverageAct->setShortcut(Qt::CTRL + Qt::Key_3);
+      connect(rateAverageAct, SIGNAL(triggered()), this, SLOT(rateAvarge()));
+      
+      rateBelowAvarageAct = new QAction(QIcon(":/images/rate-2.png"), tr("Below avarage"), this);
+      rateBelowAvarageAct->setShortcut(Qt::CTRL + Qt::Key_2);
+      connect(rateBelowAvarageAct, SIGNAL(triggered()), this, SLOT(rateBelowAverage()));      
+      
+      rateBadAct = new QAction(QIcon(":/images/rate-1.png"), tr("Bad"), this);
+      rateBadAct->setShortcut(Qt::CTRL + Qt::Key_1);
+      connect(rateBadAct, SIGNAL(triggered()), this, SLOT(rateBad()));
+      
+      rateUnratedAct = new QAction(tr("Unrated"), this);
+      rateUnratedAct->setShortcut(Qt::CTRL + Qt::Key_0);
+      connect(rateUnratedAct, SIGNAL(triggered()), this, SLOT(rateUnrated()));
+      
+      QMenu *ratingMenu = new QMenu(tr("Rating"), this);
+      ratingMenu->setIcon(QIcon(":/images/rating.png"));
+      ratingMenu->addAction(rateExcellenAct);
+      ratingMenu->addAction(rateGoodAct);
+      ratingMenu->addAction(rateAverageAct);
+      ratingMenu->addAction(rateBelowAvarageAct);
+      ratingMenu->addAction(rateBadAct);
+      ratingMenu->addAction(rateUnratedAct);
 
       contextMnu.clear();
-      contextMnu.addAction(rm);
-      contextMnu.addSeparator(); 
+      contextMnu.addAction(openphotoAct);
+      contextMnu.addSeparator();
+      contextMnu.addMenu( ratingMenu);
+      contextMnu.addSeparator();
+      contextMnu.addAction(removephotoAct); 
       contextMnu.exec( mevent->globalPos() );
 }
 
diff --git a/retroshare-gui/src/gui/unfinished/PhotoDialog.h b/retroshare-gui/src/gui/unfinished/PhotoDialog.h
index b03e1e919..e8af5dd30 100644
--- a/retroshare-gui/src/gui/unfinished/PhotoDialog.h
+++ b/retroshare-gui/src/gui/unfinished/PhotoDialog.h
@@ -78,6 +78,13 @@ private:
 
   /** Define the popup menus for the Context menu */
   QMenu* contextMnu;
+  
+  QAction *rateExcellenAct;
+  QAction *rateGoodAct;
+  QAction *rateAverageAct;
+  QAction *rateBelowAvarageAct;
+  QAction *rateBadAct;
+  QAction *rateUnratedAct;
 
   QTreeWidget *exampletreeWidget;
 
diff --git a/retroshare-gui/src/gui/unfinished/PhotoShow.ui b/retroshare-gui/src/gui/unfinished/PhotoShow.ui
index d0d49507d..112a63e4d 100644
--- a/retroshare-gui/src/gui/unfinished/PhotoShow.ui
+++ b/retroshare-gui/src/gui/unfinished/PhotoShow.ui
@@ -1,41 +1,42 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>PhotoShow</class>
- <widget class="QWidget" name="PhotoShow" >
-  <property name="geometry" >
+ <widget class="QWidget" name="PhotoShow">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>591</width>
+    <width>528</width>
     <height>421</height>
    </rect>
   </property>
-  <property name="windowTitle" >
-   <string>Form</string>
+  <property name="windowTitle">
+   <string>Photo Show</string>
   </property>
-  <layout class="QGridLayout" >
-   <item row="0" column="0" >
-    <layout class="QVBoxLayout" >
+  <layout class="QGridLayout">
+   <item row="0" column="0">
+    <layout class="QVBoxLayout">
      <item>
-      <layout class="QHBoxLayout" >
+      <layout class="QHBoxLayout">
        <item>
-        <layout class="QVBoxLayout" >
+        <layout class="QVBoxLayout">
          <item>
-          <widget class="QLabel" name="label_3" >
-           <property name="text" >
+          <widget class="QLabel" name="label_3">
+           <property name="text">
             <string>Date:</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QLabel" name="label_2" >
-           <property name="text" >
+          <widget class="QLabel" name="label_2">
+           <property name="text">
             <string>Location:</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QLabel" name="label_4" >
-           <property name="text" >
+          <widget class="QLabel" name="label_4">
+           <property name="text">
             <string>Comment:</string>
            </property>
           </widget>
@@ -43,84 +44,84 @@
         </layout>
        </item>
        <item>
-        <layout class="QVBoxLayout" >
+        <layout class="QVBoxLayout">
          <item>
-          <widget class="QLineEdit" name="dateLineEdit" />
+          <widget class="QLineEdit" name="dateLineEdit"/>
          </item>
          <item>
-          <widget class="QLineEdit" name="locLineEdit" />
+          <widget class="QLineEdit" name="locLineEdit"/>
          </item>
          <item>
-          <widget class="QLineEdit" name="commentLineEdit" />
+          <widget class="QLineEdit" name="commentLineEdit"/>
          </item>
         </layout>
        </item>
       </layout>
      </item>
      <item>
-      <layout class="QHBoxLayout" >
+      <layout class="QHBoxLayout">
        <item>
-        <widget class="QLabel" name="label_5" >
-         <property name="text" >
+        <widget class="QLabel" name="label_5">
+         <property name="text">
           <string>Display Size:</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QComboBox" name="sizeComboBox" >
+        <widget class="QComboBox" name="sizeComboBox">
          <item>
-          <property name="text" >
+          <property name="text">
            <string>320 x 320</string>
           </property>
          </item>
          <item>
-          <property name="text" >
+          <property name="text">
            <string>640 x 640</string>
           </property>
          </item>
          <item>
-          <property name="text" >
+          <property name="text">
            <string>Full Size</string>
           </property>
          </item>
         </widget>
        </item>
        <item>
-        <widget class="QLabel" name="label_6" >
-         <property name="text" >
+        <widget class="QLabel" name="label_6">
+         <property name="text">
           <string>Play Rate:</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QComboBox" name="speedComboBox" >
+        <widget class="QComboBox" name="speedComboBox">
          <item>
-          <property name="text" >
+          <property name="text">
            <string>1 Sec</string>
           </property>
          </item>
          <item>
-          <property name="text" >
+          <property name="text">
            <string>2 Sec</string>
           </property>
          </item>
          <item>
-          <property name="text" >
+          <property name="text">
            <string>5 Sec</string>
           </property>
          </item>
          <item>
-          <property name="text" >
+          <property name="text">
            <string>10 Sec</string>
           </property>
          </item>
          <item>
-          <property name="text" >
+          <property name="text">
            <string>20 Sec</string>
           </property>
          </item>
          <item>
-          <property name="text" >
+          <property name="text">
            <string>1 Min</string>
           </property>
          </item>
@@ -128,10 +129,10 @@
        </item>
        <item>
         <spacer>
-         <property name="orientation" >
+         <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
-         <property name="sizeHint" stdset="0" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>40</width>
            <height>20</height>
@@ -140,15 +141,15 @@
         </spacer>
        </item>
        <item>
-        <widget class="QPushButton" name="editButton" >
-         <property name="text" >
+        <widget class="QPushButton" name="editButton">
+         <property name="text">
           <string>Edit Photo Details</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QPushButton" name="saveButton" >
-         <property name="text" >
+        <widget class="QPushButton" name="saveButton">
+         <property name="text">
           <string>Save Photo</string>
          </property>
         </widget>
@@ -156,20 +157,23 @@
       </layout>
      </item>
      <item>
-      <widget class="QLabel" name="photoLabel" >
-       <property name="text" >
+      <widget class="QLabel" name="photoLabel">
+       <property name="text">
         <string>No Photo Selected</string>
        </property>
+       <property name="scaledContents">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
      <item>
-      <layout class="QHBoxLayout" >
+      <layout class="QHBoxLayout">
        <item>
         <spacer>
-         <property name="orientation" >
+         <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
-         <property name="sizeHint" stdset="0" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>40</width>
            <height>20</height>
@@ -178,54 +182,54 @@
         </spacer>
        </item>
        <item>
-        <widget class="QPushButton" name="startButton" >
-         <property name="text" >
-          <string>Start</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="backButton" >
-         <property name="text" >
+        <widget class="QPushButton" name="backButton">
+         <property name="text">
           <string>Back</string>
          </property>
-         <property name="icon" >
-          <iconset resource="images.qrc" >
+         <property name="icon">
+          <iconset>
            <normaloff>:/images/back.png</normaloff>:/images/back.png</iconset>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QPushButton" name="playButton" >
-         <property name="text" >
+        <widget class="QPushButton" name="startButton">
+         <property name="text">
+          <string>Start</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="playButton">
+         <property name="text">
           <string>Play </string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QPushButton" name="pauseButton" >
-         <property name="text" >
+        <widget class="QPushButton" name="pauseButton">
+         <property name="text">
           <string>Pause</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QPushButton" name="stepButton" >
-         <property name="text" >
+        <widget class="QPushButton" name="stepButton">
+         <property name="text">
           <string>Forward</string>
          </property>
-         <property name="icon" >
-          <iconset resource="images.qrc" >
+         <property name="icon">
+          <iconset>
            <normaloff>:/images/forward.png</normaloff>:/images/forward.png</iconset>
          </property>
         </widget>
        </item>
        <item>
         <spacer>
-         <property name="orientation" >
+         <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
-         <property name="sizeHint" stdset="0" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>40</width>
            <height>20</height>
@@ -240,7 +244,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="images.qrc" />
+  <include location="images.qrc"/>
  </resources>
  <connections/>
 </ui>