diff --git a/program/steps/addressbook/edit.inc b/program/steps/addressbook/edit.inc
index 5fcdcd1c6..878a6080d 100644
--- a/program/steps/addressbook/edit.inc
+++ b/program/steps/addressbook/edit.inc
@@ -110,16 +110,17 @@ function rcmail_contact_edithead($attrib)
         'head' => array(
             'name' => $RCMAIL->gettext('contactnameandorg'),
             'content' => array(
-                'prefix' => array('size' => $i_size),
-                'firstname' => array('size' => $i_size, 'visible' => true),
-                'middlename' => array('size' => $i_size),
-                'surname' => array('size' => $i_size, 'visible' => true),
-                'suffix' => array('size' => $i_size),
-                'name' => array('size' => 2*$i_size),
-                'nickname' => array('size' => 2*$i_size),
-                'organization' => array('size' => 2*$i_size),
-                'department' => array('size' => 2*$i_size),
-                'jobtitle' => array('size' => 2*$i_size),
+                'source'        => array('id' => '_source', 'label' => $RCMAIL->gettext('addressbook')),
+                'prefix'        => array('size' => $i_size),
+                'firstname'     => array('size' => $i_size, 'visible' => true),
+                'middlename'    => array('size' => $i_size),
+                'surname'       => array('size' => $i_size, 'visible' => true),
+                'suffix'        => array('size' => $i_size),
+                'name'          => array('size' => 2*$i_size),
+                'nickname'      => array('size' => 2*$i_size),
+                'organization'  => array('size' => 2*$i_size),
+                'department'    => array('size' => 2*$i_size),
+                'jobtitle'      => array('size' => 2*$i_size),
             )
         )
     );
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
index 23dcb9178..eba2b04ab 100644
--- a/program/steps/addressbook/func.inc
+++ b/program/steps/addressbook/func.inc
@@ -522,6 +522,7 @@ function rcmail_contact_form($form, $record, $attrib = null)
 
     // group fields
     $head_fields = array(
+        'source'       => array('source'),
         'names'        => array('prefix','firstname','middlename','surname','suffix'),
         'displayname'  => array('name'),
         'nickname'     => array('nickname'),
@@ -540,6 +541,7 @@ function rcmail_contact_form($form, $record, $attrib = null)
     $edit_mode   = $RCMAIL->action != 'show' && $RCMAIL->action != 'print';
     $compact     = rcube_utils::get_boolean($attrib['compact-form']);
     $use_labels  = rcube_utils::get_boolean($attrib['use-labels']);
+    $with_source = rcube_utils::get_boolean($attrib['with-source']);
     $out         = '';
 
     if ($attrib['deleteicon']) {
@@ -591,8 +593,23 @@ function rcmail_contact_form($form, $record, $attrib = null)
                 $block_attr = array('class' => $blockname  . (count($colnames) == 1 ? ' row' : ''));
 
                 foreach ($colnames as $col) {
+                    if ($col == 'source') {
+                        if (!$with_source || !($source = $RCMAIL->output->get_env('sourcename'))) {
+                            continue;
+                        }
+
+                        if (!$edit_mode) {
+                            $record['source'] = $RCMAIL->gettext('addressbook') . ': ' . $source;
+                        }
+                        else if ($RCMAIL->action == 'add') {
+                            $record['source'] = $source;
+                        }
+                        else {
+                            continue;
+                        }
+                    }
                     // skip cols unknown to the backend
-                    if (!$coltypes[$col]) {
+                    else if (!$coltypes[$col]) {
                         continue;
                     }
 
@@ -612,9 +629,12 @@ function rcmail_contact_form($form, $record, $attrib = null)
                         }
                     }
                     else {
-                        $colprop       = (array)$fieldset['content'][$col] + (array)$coltypes[$col];
-                        $colprop['id'] = 'ff_' . $col;
-                        $visible       = true;
+                        $colprop = (array)$fieldset['content'][$col] + (array)$coltypes[$col];
+                        $visible = true;
+
+                        if (empty($colprop['id'])) {
+                            $colprop['id'] = 'ff_' . $col;
+                        }
 
                         if (empty($record[$col]) && !$colprop['visible']) {
                             $visible          = false;
@@ -622,7 +642,12 @@ function rcmail_contact_form($form, $record, $attrib = null)
                             $select_add->add($colprop['label'], $col);
                         }
 
-                        $input = rcube_output::get_edit_field($col, $record[$col], $colprop, $colprop['type']);
+                        if ($col == 'source') {
+                            $input = rcmail_source_selector(array('id' => $colprop['id']));
+                        }
+                        else {
+                            $input = rcube_output::get_edit_field($col, $record[$col], $colprop, $colprop['type']);
+                        }
 
                         if ($use_labels) {
                             $_content = html::label($colprop['id'], rcube::Q($colprop['label'])) . html::div(null, $input);
@@ -647,7 +672,8 @@ function rcmail_contact_form($form, $record, $attrib = null)
                 $content .= html::p('addfield', $select_add->show(null));
             }
 
-            $out .= html::tag('fieldset', $attrib, (!empty($fieldset['name']) ? html::tag('legend', null, rcube::Q($fieldset['name'])) : '') . $content) ."\n";
+            $legend = !empty($fieldset['name']) ? html::tag('legend', null, rcube::Q($fieldset['name'])) : '';
+            $out   .= html::tag('fieldset', $attrib, $legend . $content, html::$common_attrib) ."\n";
             continue;
         }
 
diff --git a/program/steps/addressbook/show.inc b/program/steps/addressbook/show.inc
index 24990ac48..74779e454 100644
--- a/program/steps/addressbook/show.inc
+++ b/program/steps/addressbook/show.inc
@@ -70,6 +70,7 @@ function rcmail_contact_head($attrib)
         'head' => array(  // section 'head' is magic!
             'name' => $RCMAIL->gettext('contactnameandorg'),
             'content' => array(
+                'source'       => array('type' => 'text'),
                 'prefix'       => array('type' => 'text'),
                 'firstname'    => array('type' => 'text'),
                 'middlename'   => array('type' => 'text'),