diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index 35e94f29ca5..e6e6bf75ac8 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -528,6 +528,8 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
             $actionstatic->type_picto=$histo[$key]['apicto'];
             $actionstatic->type_code=$histo[$key]['acode'];
 
+            $url = DOL_URL_ROOT.'/comm/action/card.php?id='.$histo[$key]['id'];
+
             $tmpa=dol_getdate($histo[$key]['datestart'], false);
             if($actualCycleDate !== $tmpa['year'].'-'.$tmpa['yday']){
                 $actualCycleDate = $tmpa['year'].'-'.$tmpa['yday'];
@@ -598,7 +600,18 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 
             $out.='<div class="timeline-item">'."\n";
 
+            $out.='<span class="timeline-header-action">';
 
+            //$out.='<a href="'.$url.'" class="timeline-btn">'.$langs->trans('Show').'</a>';
+
+            if ($user->rights->agenda->allactions->create ||
+                (($actionstatic->authorid == $user->id || $actionstatic->userownerid == $user->id) && $user->rights->agenda->myactions->create))
+            {
+                $out.='<a class="timeline-btn" href="' . DOL_MAIN_URL_ROOT.  '/comm/action/card.php?action=edit&id='.$actionstatic->id.'"><i class="fa fa-pencil" title="'.$langs->trans("Modify").'" ></i></a>';
+            }
+
+
+            $out.='</span>';
             // Date
             $out.='<span class="time"><i class="fa fa-clock-o"></i> ';
             $out.=dol_print_date($histo[$key]['datestart'], 'dayhour');
@@ -643,6 +656,9 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 
             // Title
             $out .= ' <span class="messaging-title">';
+
+
+
             if($actionstatic->code == 'TICKET_MSG') {
                 $out .= $langs->trans('TicketNewMessage');
             }else{
@@ -660,6 +676,8 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
                     $out .= dol_trunc($libelle, 120);
                 }
             }
+
+
             $out .= '</span>';
 
             $out.='</h3>';
@@ -679,7 +697,29 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
             $footer = '';
 
             // Contact for this action
-            if (empty($objcon->id) && isset($histo[$key]['contact_id']) && $histo[$key]['contact_id'] > 0)
+            if (isset($histo[$key]['socpeopleassigned']) && is_array($histo[$key]['socpeopleassigned']) && count($histo[$key]['socpeopleassigned']) > 0) {
+
+                $contactList = '';
+                foreach ($histo[$key]['socpeopleassigned'] as $cid => $Tab) {
+                    $contact = new Contact($db);
+                    $result = $contact->fetch($cid);
+
+                    if ($result < 0)
+                        dol_print_error($db, $contact->error);
+
+                    if ($result > 0) {
+                        $contactList.= !empty($contactList)?', ':'';
+                        $contactList .= $contact->getNomUrl(1);
+                        if (isset($histo[$key]['acode']) && $histo[$key]['acode'] == 'AC_TEL') {
+                            if (! empty($contact->phone_pro))
+                                $contactList .= '(' . dol_print_phone($contact->phone_pro) . ')';
+                        }
+                    }
+                }
+
+                $footer .= $langs->trans('ActionOnContact').' : '.$contactList;
+            }
+            elseif (empty($objcon->id) && isset($histo[$key]['contact_id']) && $histo[$key]['contact_id'] > 0)
             {
                 $contact = new Contact($db);
                 $result = $contact->fetch($histo[$key]['contact_id']);
@@ -694,24 +734,6 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
                             $footer .= '(' . dol_print_phone($contact->phone_pro) . ')';
                     }
                 }
-            } elseif (isset($histo[$key]['socpeopleassigned']) && is_array($histo[$key]['socpeopleassigned']) && count($histo[$key]['socpeopleassigned']) > 0) {
-
-                foreach ($histo[$key]['socpeopleassigned'] as $cid => $Tab) {
-                    $contact = new Contact($db);
-                    $result = $contact->fetch($cid);
-
-                    if ($result < 0)
-                        dol_print_error($db, $contact->error);
-
-                    if ($result > 0) {
-                        $footer .= $contact->getNomUrl(1);
-                        if (isset($histo[$key]['acode']) && $histo[$key]['acode'] == 'AC_TEL') {
-                            if (! empty($contact->phone_pro))
-                                $footer .= '(' . dol_print_phone($contact->phone_pro) . ')';
-                        }
-                    }
-                }
-
             }
 
             if(!empty($footer)){
diff --git a/htdocs/theme/eldy/timeline.inc.php b/htdocs/theme/eldy/timeline.inc.php
index 8696d6f449f..c42605321ae 100644
--- a/htdocs/theme/eldy/timeline.inc.php
+++ b/htdocs/theme/eldy/timeline.inc.php
@@ -35,7 +35,7 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
 }
 .timeline > li {
     position: relative;
-    margin-right: 10px;
+    margin-right: 0;
     margin-bottom: 15px;
 }
 .timeline > li:before,
@@ -55,16 +55,60 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
     background: #fff;
     color: #444;
     margin-left: 60px;
-    margin-right: 15px;
+    margin-right: 0px;
     padding: 0;
     position: relative;
 }
-.timeline > li > .timeline-item > .time {
+.timeline > li > .timeline-item > .time{
     color: #6f6f6f;
     float: right;
     padding: 10px;
     font-size: 12px;
 }
+
+
+.timeline > li > .timeline-item > .timeline-header-action{
+    color: #6f6f6f;
+    float: right;
+    padding: 7px;
+    font-size: 12px;
+}
+
+
+a.timeline-btn:link,
+a.timeline-btn:visited,
+a.timeline-btn:hover,
+a.timeline-btn:active
+{
+    display: inline-block;
+    margin-bottom: 0;
+    font-weight: 400;
+    border-radius: 0;
+    box-shadow: none;
+    padding: 1px 5px;
+    font-size: 12px;
+    line-height: 1.5;
+    text-align: center;
+    white-space: nowrap;
+    vertical-align: middle;
+    touch-action: manipulation;
+    cursor: pointer;
+    user-select: none;
+    background-image: none;
+    text-decoration: none;
+    background-color: #f4f4f4;
+    color: #444;
+    border: 1px solid #ddd;
+}
+
+a.timeline-btn:hover
+{
+    background-color: #e7e7e7;
+    color: #333;
+    border-color: #adadad;;
+}
+
+
 .timeline > li > .timeline-item > .timeline-header {
     margin: 0;
     color: #333;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 205ed21bdcf..88791a18440 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -5746,6 +5746,7 @@ border-top-right-radius: 6px;
 include dol_buildpath($path.'/theme/'.$theme.'/dropdown.inc.php', 0);
 include dol_buildpath($path.'/theme/'.$theme.'/info-box.inc.php', 0);
 include dol_buildpath($path.'/theme/'.$theme.'/progress.inc.php', 0);
+include dol_buildpath($path.'/theme/eldy/timeline.inc.php', 0); // actually md use same style as eldy theme