diff --git a/src/components/ChatBuble.vue b/src/components/ChatBuble.vue
index d5949e7..6269d0e 100644
--- a/src/components/ChatBuble.vue
+++ b/src/components/ChatBuble.vue
@@ -3,7 +3,6 @@
 import AssistantAvatar from './AssistantAvatar.vue';
 import DescreteButton from './ButtonComponent.vue';
 import UserAvatar from './UserAvatar.vue';
-import ReloadIcon from './icons/ReloadIcon.vue';
 import CopyIcon from './icons/CopyIcon.vue';
 import TooltipComponent from './TooltipComponent.vue';
 import { marked } from 'marked';
@@ -17,9 +16,15 @@ defineProps<{
   isUSer: boolean;
   isLast: boolean;
   shouldDisable: boolean;
-  rephrase?: () => void;
 }>();
 
+const renderer = new marked.Renderer();
+const linkRenderer = renderer.link;
+renderer.link = (href, title, text) => {
+  const html = linkRenderer.call(renderer, href, title, text);
+  return html.replace(/^<a /, '<a target="_blank" rel="nofollow" ');
+};
+
 const copyMessage = (msg: string) => {
   if (timeOut.value) {
     window.clearTimeout(timeOut.value);
@@ -38,7 +43,7 @@ const copyMessage = (msg: string) => {
       <UserAvatar v-if="isUSer" />
       <AssistantAvatar v-else />
     </div>
-    <p class="chat-bubble-content" v-html="marked.parse(message)" />
+    <p class="chat-bubble-content" v-html="marked.parse(message, { renderer })" />
     <div class="details">
       <DescreteButton
         class="detail-button"
@@ -50,16 +55,6 @@ const copyMessage = (msg: string) => {
         <CopyIcon class="icon-action" />
         <TooltipComponent class="tltip" :tooltipText="copied ? $t('copied') : $t('copy')" isRight />
       </DescreteButton>
-      <DescreteButton
-        class="detail-button"
-        :aria-label="$t('rephrase')"
-        isDiscreet
-        v-if="!isUSer && isLast && !shouldDisable"
-        @click="rephrase && rephrase()"
-      >
-        <ReloadIcon class="icon-action" />
-        <TooltipComponent class="tltip" :tooltipText="$t('rephrase')" isRight />
-      </DescreteButton>
     </div>
   </div>
 </template>
diff --git a/src/components/ChatComponent.vue b/src/components/ChatComponent.vue
index be8595d..a02141d 100644
--- a/src/components/ChatComponent.vue
+++ b/src/components/ChatComponent.vue
@@ -38,7 +38,6 @@ const computedStatus = computed(() => store.chatStatus);
             v-for="({ content, role }, index) in store.chatMessagesList"
             :message="content"
             :isUSer="role === 'user'"
-            :rephrase="store.fetchRephrase"
             :isLast="index === store.chatMessagesList.length - 1"
             :shouldDisable="computedStatus !== CHAT_STATUS.DONE"
           />
diff --git a/src/localisation/en.ts b/src/localisation/en.ts
index 670fea4..c2aaaca 100644
--- a/src/localisation/en.ts
+++ b/src/localisation/en.ts
@@ -291,7 +291,6 @@ export const en = {
   removeAll: 'Clear all',
   removeBookmark: 'Remove bookmark',
   removeSelection: 'Clear',
-  rephrase: 'Rephrase',
   searchBarPlaceholder: 'Search...',
   sdgsAcronym: 'SDGs',
   sdgs: {
diff --git a/src/localisation/fr.ts b/src/localisation/fr.ts
index fb51f42..5452ed7 100644
--- a/src/localisation/fr.ts
+++ b/src/localisation/fr.ts
@@ -293,7 +293,6 @@ export const fr = {
   removeAll: 'Tout effacer',
   removeBookmark: 'Retirer des favoris',
   removeSelection: 'Effacer',
-  rephrase: 'Reformuler',
   searchBarPlaceholder: 'Rechercher...',
   sdgsAcronym: 'ODD',
   sdgs: {
diff --git a/src/stores/chat.ts b/src/stores/chat.ts
index 54a1a14..0b4270b 100644
--- a/src/stores/chat.ts
+++ b/src/stores/chat.ts
@@ -1,7 +1,7 @@
 import { defineStore } from 'pinia';
 import { computed, ref, type ComputedRef, type Ref } from 'vue';
 import type { Document, ChatMessage, ChatProcessingMetadata } from '@/types';
-import { baseGetAxios, basePostAxios, fetchStream } from '@/utils/fetch';
+import { baseGetAxios, fetchStream } from '@/utils/fetch';
 import { getQueryParamValue } from '@/utils/urlsUtils';
 import { getFromStorage, saveToStorage, clearFromStorage } from '@/utils/storage';
 import { extractProcessingMetadata } from '@/utils/chatProcessing';
@@ -113,10 +113,6 @@ export const useChatStore = defineStore('chat', () => {
     () => getQueryParamValue('score') === 'true'
   );
 
-  const getMessageHistory: ComputedRef<ChatMessage[]> = computed(() => {
-    return chatMessagesList.value.slice(0, -1);
-  });
-
   function addToMessageList(message: ChatMessage): void {
     if (!message.content.length) {
       return;
@@ -148,30 +144,6 @@ export const useChatStore = defineStore('chat', () => {
     }
   }
 
-  async function fetchRephrase() {
-    clearProcessingMetadata();
-    chatStatus.value = CHAT_STATUS.FORMULATING_ANSWER;
-    // get the content of the message which the role is assistant
-    const lastAssistantMessage = [...chatMessagesList.value]
-      .reverse()
-      .find((msg) => msg.role === 'assistant')?.content;
-
-    const bodyContent = {
-      sources: sourcesList.value,
-      history: getMessageHistory.value,
-      query: lastAssistantMessage,
-      ...(storedSubject.value && { subject: storedSubject.value })
-    };
-
-    const respBody = await basePostAxios('/qna/chat/rephrase', bodyContent);
-
-    chatMessagesList.value.push({ role: 'assistant', content: respBody.data });
-    saveToStorage('chat', chatMessagesList.value);
-
-    chatStatus.value = CHAT_STATUS.FORMULATED_ANSWER;
-    chatStatus.value = CHAT_STATUS.DONE;
-  }
-
   async function getAgentAnswer(userMsg: string) {
     clearProcessingMetadata();
 
@@ -452,7 +424,6 @@ export const useChatStore = defineStore('chat', () => {
     sourcesList,
     reformulatedQuery,
     onSendMessage,
-    fetchRephrase,
     clearInput,
     setReformulatedQuery,
     shouldDisplayScore,