diff --git a/src/lib/msgUtils.js b/src/lib/msgUtils.js
index 8ab0865..989e934 100644
--- a/src/lib/msgUtils.js
+++ b/src/lib/msgUtils.js
@@ -31,9 +31,9 @@ export const sentMsgTypeMapped = {
       renderId: msg.id,
       to: msg.to,
       msgtype: 'text',
-      msgcontent: { body: msg.text, ...(msg.context ? { context: msg.context } : {}) },
+      msgcontent: { body: msg.text, ...(msg.context ? { context: msg.context, message_origin: msg.message_origin } : {}) },
     }),
-    contentToRender: (msg) => ({ ...msg, actionId: msg.id, conversationid: msg.id.split('.')[0], ...(msg.context ? { reply: { message: msg.context.message_origin.text, title: msg.context.message_origin.senderName || 'Reference' } } : {}) }),
+    contentToRender: (msg) => ({ ...msg, actionId: msg.id, conversationid: msg.id.split('.')[0], ...(msg.context ? { reply: { message: msg.message_origin.text, title: msg.message_origin.senderName || 'Reference' } } : {}) }),
   },
   whatsappTemplate: {
     contentToSend: (msg) => ({ action: 'message', actionId: msg.id, renderId: msg.id, to: msg.to, msgtype: 'template', msgcontent: msg.template }),
diff --git a/src/views/Conversations/Components/InputComposer.jsx b/src/views/Conversations/Components/InputComposer.jsx
index 4bcf2cb..0ca4590 100644
--- a/src/views/Conversations/Components/InputComposer.jsx
+++ b/src/views/Conversations/Components/InputComposer.jsx
@@ -44,7 +44,7 @@ const InputBox = () => {
         id: `${currentConversation.sn}.${uuid()}`, // Date.now().toString(16),
         date: new Date(),
         status: 'waiting',
-        ...(referenceMsg.id ? { context: { message_id: referenceMsg.id, from: referenceMsg.from , message_origin: referenceMsg } } : {}),
+        ...(referenceMsg.id ? { context: { message_id: referenceMsg.id, }, message_origin: referenceMsg } : {}),
       };
       invokeSendMessage(msgObj);
       setTextContent('');
@@ -77,12 +77,12 @@ const InputBox = () => {
         autoSize={{ minRows: 2, maxRows: 6 }}
       />
       <Flex justify={'space-between'} className=' bg-gray-200 p-1 rounded-b'>
-        <Flex gap={4} className='divide-y-0 divide-x divide-solid divide-gray-500 '>
+        <Flex gap={4} className='divide-y-0 divide-x divide-solid divide-gray-500 *:text-primary *:rounded-none'>
           <InputTemplate key='templates' disabled={!talkabled} invokeSendMessage={invokeSendMessage} />
-          {/* <Button type='text' className=' rounded-none text-primary' icon={<PictureOutlined />} size={'middle'} /> */}
-          {/* <Button type='text' className=' rounded-none text-primary' icon={<FolderAddOutlined />} size={'middle'} /> */}
-          {/* <Button type='text' className=' rounded-none text-primary' icon={<CloudUploadOutlined />} size={'middle'} /> */}
-          {/* <Button type='text' className=' rounded-none text-primary' icon={<FilePdfOutlined />} size={'middle'} /> */}
+          <Button key={'addPic'} type='text' disabled={!textabled} className='' icon={<PictureOutlined />} size={'middle'} />
+          {/* <Button type='text' className='' icon={<FolderAddOutlined />} size={'middle'} /> */}
+          {/* <Button type='text' className='' icon={<CloudUploadOutlined />} size={'middle'} /> */}
+          {/* <Button type='text' className='' icon={<FilePdfOutlined />} size={'middle'} /> */}
         </Flex>
         <Button key={'send-btn'} onClick={handleSendText} type='primary' size='middle' icon={<SendOutlined />}
         disabled={!textabled}
diff --git a/src/views/Conversations/Components/InputTemplate.jsx b/src/views/Conversations/Components/InputTemplate.jsx
index 50495bd..fb949cb 100644
--- a/src/views/Conversations/Components/InputTemplate.jsx
+++ b/src/views/Conversations/Components/InputTemplate.jsx
@@ -179,7 +179,7 @@ const InputTemplate = ({ disabled = false, invokeSendMessage }) => {
         trigger='click'
         open={openTemplates}
         onOpenChange={setOpenTemplates}>
-        <Button type='text' className=' rounded-none text-primary' icon={<MessageOutlined />} size={'middle'} disabled={disabled} />
+        <Button type='text' className='' icon={<MessageOutlined />} size={'middle'} disabled={disabled} />
       </Popover>
     </>
   );