Index: CRM/Case/BAO/Case.php
===================================================================
--- CRM/Case/BAO/Case.php	(revision 33)
+++ CRM/Case/BAO/Case.php	(working copy)
@@ -1366,6 +1366,7 @@
         $activityParams['medium_id']          = CRM_Core_OptionGroup::getValue( 'encounter_medium', 'email', 'name' );
         $activityParams['case_id']            = $caseId;
         $activityParams['is_auto']            = 0;
+        $activityParams['target_id']          = $clientId;

         $tplParams['activitySubject'] = $activitySubject;

@@ -2499,7 +2500,7 @@
                                                               "reset=1&aid={$activityParams['source_record_id']}&cid={$tplParams['contact']['contact_id']}&caseID={$activityParams['case_id']}", true );

             $tplParams['manageCaseURL'] = CRM_Utils_System::url( 'civicrm/contact/view/case',
-                                                              "reset=1&id={$activityParams['case_id']}&cid={$tplParams['contact']['contact_id']}&action=view&context=home", true );
+                                                              "reset=1&id={$activityParams['case_id']}&cid={$activityParams['target_id'}&action=view&context=home", true );
         } else {
             $tplParams['editActURL'] = CRM_Utils_System::url( 'civicrm/contact/view/activity',
                                                               "atype=$activityTypeId&action=update&reset=1&id={$activityParams['source_record_id']}&cid={$tplParams['contact']['contact_id']}&context=activity", true );