diff --git a/app/Controllers/Activities.php b/app/Controllers/Activities.php
index 8e4f977..51992c4 100644
--- a/app/Controllers/Activities.php
+++ b/app/Controllers/Activities.php
@@ -1275,7 +1275,12 @@ class Activities extends Controller {
         $query = $db->query($sql);
         $result = $query->getResultArray();
         $data['sitecontact'] = $result;
-		
+
+		$certificateModel = new CertificateModel();
+		$certificates = $certificateModel->select('cert_name, file_url')->where('actid', $actid)->asArray()->findAll();
+		$data['certificates_name'] = array_column($certificates, 'cert_name');
+		$data['certificates_name'] = implode(', ', $data['certificates_name']);
+
       	$sql = "select contactemail as email from sitecontact where siteid = '$siteid' and enddate is null
 			UNION SELECT distinct email_1 as emails FROM users WHERE `enddate` IS NULL 
 			UNION SELECT email_2 FROM users WHERE `enddate` IS NULL
@@ -1297,7 +1302,7 @@ class Activities extends Controller {
 			// 	return redirect()->to('activities/')->with('error', 'Email Sudah Pernah Dikirim');
 			// }
 
-			$email = \Config\Services::email();
+			// $email = \Config\Services::email();
 			$sql = "update activities set sendmail='1' where actid='$actid'";
 			$query = $db->query($sql);
 			
@@ -1308,7 +1313,7 @@ class Activities extends Controller {
 			$subject = $this->request->getVar('subject');
 			$message = $this->request->getVar('message');
 			$attachment = $this->request->getVar('attachment');
-			$attachments = explode(',',$attachment);
+			// $attachments = explode(',',$attachment);
 
 			/*
 			$email->setFrom('noreply@services.summit.co.id', 'SUMMIT CRM');
@@ -1353,6 +1358,7 @@ class Activities extends Controller {
 				'subject' => $subject,
 				'message' => $message,
 				'attachment' => $attachment,
+				'certificates' => $certificates
 			];
 			$jsonData = json_encode($data);
 			//print_r($jsonData);
@@ -1666,6 +1672,7 @@ class Activities extends Controller {
 		return view('invtrans_index', $data);
 	}
 
+	// Untuk CRUD Sertifikat Maintenance
 	public function createCertificateMaintenance ($actid, $issuedDate, $userid_owner) {
 
 		$db = \Config\Database::connect();
diff --git a/app/Views/activities_compose.php b/app/Views/activities_compose.php
index abed2e7..296d01c 100644
--- a/app/Views/activities_compose.php
+++ b/app/Views/activities_compose.php
@@ -97,6 +97,12 @@ foreach ($emails as $data) {
 								<textarea class="form-control form-control-sm" name="message" id="message"><?=$content;?></textarea>
 								</div>
 							</div>
+							<div class="row mb-2">
+								<label for="certificate" class="col-sm-2 col-form-label">Certificate list</label>
+								<div class="col-sm-10">
+								<input type="text" class="form-control form-control-sm" name="certificate" id="certificate" value="<?=$certificates_name?>" readonly>
+								</div>
+							</div>
 							<div class="row mb-2">
 								<label for="attachment" class="col-sm-2 col-form-label">Attachment list</label>
 								<div class="col-sm-10">