diff --git a/MyTracks/res/drawable-hdpi/ic_menu_view_photo.png b/MyTracks/res/drawable-hdpi/ic_menu_view_photo.png
new file mode 100644
index 000000000..0f650ee25
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/ic_menu_view_photo.png differ
diff --git a/MyTracks/res/drawable-mdpi/ic_menu_view_photo.png b/MyTracks/res/drawable-mdpi/ic_menu_view_photo.png
new file mode 100644
index 000000000..d6235554b
Binary files /dev/null and b/MyTracks/res/drawable-mdpi/ic_menu_view_photo.png differ
diff --git a/MyTracks/res/drawable-xhdpi/ic_menu_view_photo.png b/MyTracks/res/drawable-xhdpi/ic_menu_view_photo.png
new file mode 100644
index 000000000..3f93e4f65
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/ic_menu_view_photo.png differ
diff --git a/MyTracks/res/menu/marker_detail.xml b/MyTracks/res/menu/marker_detail.xml
index 0f44aa7de..3ec4f4b31 100644
--- a/MyTracks/res/menu/marker_detail.xml
+++ b/MyTracks/res/menu/marker_detail.xml
@@ -30,4 +30,9 @@ limitations under the License.
     android:id="@+id/marker_detail_delete"
     android:showAsAction="ifRoom"
     android:title="@string/menu_delete"/>
+  <item
+    android:icon="@drawable/ic_menu_view_photo"
+    android:id="@+id/marker_detail_view_photo"
+    android:showAsAction="ifRoom"
+    android:title="@string/menu_view_photo"/>
 </menu>
\ No newline at end of file
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 4b8d0f4d8..d39c9f4fe 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -1240,6 +1240,12 @@ limitations under the License.
       Character limit: ~20 (1 line)">
     Terrain
   </string>
+  <string name="menu_view_photo"
+    translation_description="In the menu, to view a photo.
+
+      Character limit: ~20 (1 line)">
+    View photo
+  </string>
   <string name="menu_voice_frequency"
     translation_description="In the menu, to configure the voice frequency, how frequent to announce
       status.
diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java
index 22d06bf01..7c54952a0 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java
@@ -179,6 +179,10 @@ public class MarkerDetailFragment extends Fragment {
 
     menu.findItem(R.id.marker_detail_edit).setVisible(!isSharedWithMe);
     menu.findItem(R.id.marker_detail_delete).setVisible(!isSharedWithMe);
+
+    String photoUrl = waypoint.getPhotoUrl();
+    boolean hasPhoto = photoUrl != null && !photoUrl.equals("");
+    menu.findItem(R.id.marker_detail_view_photo).setVisible(hasPhoto);
   }
 
   @Override
@@ -202,6 +206,12 @@ public class MarkerDetailFragment extends Fragment {
         DeleteMarkerDialogFragment.newInstance(new long[] { markerId })
             .show(getChildFragmentManager(), DeleteMarkerDialogFragment.DELETE_MARKER_DIALOG_TAG);
         return true;
+      case R.id.marker_detail_view_photo:
+        intent = new Intent();
+        intent.setAction(Intent.ACTION_VIEW);
+        intent.setDataAndType(Uri.parse(waypoint.getPhotoUrl()), "image/*");
+        startActivity(intent);
+        return true;
       default:
         return super.onOptionsItemSelected(item);
     }