3 files changed, 5 insertions, 3 deletions
diff --git a/program/steps/addressbook/edit.inc b/program/steps/addressbook/edit.inc
index 05572de2b..39161127c 100644
--- a/program/steps/addressbook/edit.inc
+++ b/program/steps/addressbook/edit.inc
@@ -53,6 +53,7 @@ else {
     $CONTACTS = rcmail_contact_source($source, true);
 }
 
+$SOURCE_ID = $source;
 
 function rcmail_get_edit_record()
 {
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
index 2cb2b8a93..d0be00dbb 100644
--- a/program/steps/addressbook/func.inc
+++ b/program/steps/addressbook/func.inc
@@ -619,7 +619,7 @@ function rcmail_contact_form($form, $record, $attrib = null)
 
 function rcmail_contact_photo($attrib)
 {
-    global $CONTACTS, $CONTACT_COLTYPES, $RCMAIL, $CONFIG;
+    global $SOURCE_ID, $CONTACTS, $CONTACT_COLTYPES, $RCMAIL, $CONFIG;
 
     if (!$CONTACT_COLTYPES['photo'])
         return '';
@@ -634,7 +634,7 @@ function rcmail_contact_photo($attrib)
     if (strpos($record['photo'], 'http:') === 0)
         $photo_img = $record['photo'];
     else if ($record['photo'])
-        $photo_img = $RCMAIL->url(array('_action' => 'photo', '_cid' => $record['ID'], '_source' => $_REQUEST['_source']));
+        $photo_img = $RCMAIL->url(array('_action' => 'photo', '_cid' => $record['ID'], '_source' => $SOURCE_ID));
     else
         $ff_value = '-del-'; // will disable delete-photo action
 
diff --git a/program/steps/addressbook/show.inc b/program/steps/addressbook/show.inc
index 36aff3141..fc983e60b 100644
--- a/program/steps/addressbook/show.inc
+++ b/program/steps/addressbook/show.inc
@@ -25,7 +25,8 @@ $source = key($cids);
 $cid    = array_shift($cids[$source]);
 
 // Initialize addressbook source
-$CONTACTS = rcmail_contact_source($source, true);
+$CONTACTS  = rcmail_contact_source($source, true);
+$SOURCE_ID = $source;
 
 // read contact record
 if ($cid && ($record = $CONTACTS->get_record($cid, true))) {