diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php
index 35aad3df7..40ecbc0a1 100644
--- a/app/Http/Controllers/Agent/helpdesk/TicketController.php
+++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php
@@ -2422,8 +2422,6 @@ class TicketController extends Controller
             $new_thread = new Ticket_Thread();
             $new_thread->ticket_id = $thread->ticket_id;
             $new_thread->user_id = Auth::user()->id;
-            $new_thread->poster = $thread->poster;
-            $new_thread->source = $thread->source;
             $new_thread->is_internal = 0;
             $new_thread->title = $thread->title;
             $new_thread->body = Lang::get('lang.get_merge_message').
@@ -2435,8 +2433,6 @@ class TicketController extends Controller
             $new_parent_thread = new Ticket_Thread();
             $new_parent_thread->ticket_id = $p_id;
             $new_parent_thread->user_id = Auth::user()->id;
-            $new_parent_thread->poster = $parent_thread->poster;
-            $new_parent_thread->source = $parent_thread->source;
             $new_parent_thread->is_internal = 1;
             $new_parent_thread->title = $thread->title;
             $new_parent_thread->body = Lang::get('lang.ticket')."&nbsp;<a href='".route('ticket.thread', [$value])."'>#".$ticket->ticket_number.'</a>&nbsp'.Lang::get('lang.ticket_merged').'<br><br><b>'.Lang::get('lang.merge-reason').':</b>&nbsp;&nbsp;'.$reason;
diff --git a/app/Model/helpdesk/Ticket/Ticket_attachments.php b/app/Model/helpdesk/Ticket/Ticket_attachments.php
index da680a731..7f0f5107d 100644
--- a/app/Model/helpdesk/Ticket/Ticket_attachments.php
+++ b/app/Model/helpdesk/Ticket/Ticket_attachments.php
@@ -16,6 +16,13 @@ class Ticket_attachments extends Model
         $this->attributes['file'] = base64_encode($value);
     }
 
+    public function getFileAttribute($value)
+    {
+        if (base64_decode($value, true) === false) {
+           $value = base64_encode($value);
+        }
+        return $value;
+    }
     public function getFile()
     {
         $size = $this->size;