diff --git a/client/src/components/Avatar.tsx b/client/src/components/Avatar.tsx
index 999e36e..d3be981 100644
--- a/client/src/components/Avatar.tsx
+++ b/client/src/components/Avatar.tsx
@@ -10,17 +10,25 @@ const Avatar = ({ user }: any) => {
   const [firstLoad, setFirstLoad] = useState(true);
 
   if (firstLoad) {
-    fetch(gravatarUrl).then((response) => {
-      if (response.status === 200) {
-        setAvatar(gravatarUrl);
-      }
-      setFirstLoad(false);
-    });
+    fetch(gravatarUrl)
+      .then((response) => {
+        if (response.ok) {
+          setAvatar(gravatarUrl);
+        }
+        setFirstLoad(false);
+      })
+      .catch((e) => {
+        setFirstLoad(false);
+      });
   }
 
   return (
     <div className="avatar shrink-0">
-      <Image src={avatar} alt="avatar" className="rounded-full w-12 h-12 md:w-16 md:h-16 transition-all cursor-pointer" />
+      <Image
+        src={avatar}
+        alt="avatar"
+        className="rounded-full w-12 h-12 md:w-16 md:h-16 transition-all cursor-pointer"
+      />
     </div>
   );
 };
diff --git a/client/src/components/Message.tsx b/client/src/components/Message.tsx
index 0c48a51..26e4378 100644
--- a/client/src/components/Message.tsx
+++ b/client/src/components/Message.tsx
@@ -40,14 +40,17 @@ const Message = ({ message }: any) => {
           </div>
           <Text text={message.content} />
           {message.image && <Image src={message.image} alt="image" className="w-fit rounded-lg cursor-pointer" />}
-          <div className="text-grey-light date">
-            {new Date(message.createdAt).toLocaleDateString(undefined, {
-              year: 'numeric',
-              month: 'long',
-              day: 'numeric',
-              hour: 'numeric',
-              minute: 'numeric',
-            })}
+          <div className="flex justify-between">
+            <div className="text-grey-light date">
+              {new Date(message.createdAt).toLocaleDateString(undefined, {
+                year: 'numeric',
+                month: 'long',
+                day: 'numeric',
+                hour: 'numeric',
+                minute: 'numeric',
+              })}
+            </div>
+            {message.edited && <div className="text-grey-light italic">Modifié</div>}
           </div>
           {me.data?.id === message.author.id ? null : (
             <Like
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index b2dd327..194cee1 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -37,6 +37,7 @@ model Post {
   updatedAt DateTime @updatedAt
   likes     Int      @default(0)
   likedBy   Like[]
+  edited    Boolean  @default(false)
 }
 
 model Like {
diff --git a/src/controller/PostController.ts b/src/controller/PostController.ts
index dc8bf91..28b12af 100644
--- a/src/controller/PostController.ts
+++ b/src/controller/PostController.ts
@@ -66,6 +66,7 @@ const editPost = async (post: Post): Promise<PrismaPost | null | Error> => {
     data: {
       content: post.content,
       image: post.image,
+      edited: true,
     },
   });
 
diff --git a/src/models/PostModel.ts b/src/models/PostModel.ts
index 4397d65..b7c60ce 100644
--- a/src/models/PostModel.ts
+++ b/src/models/PostModel.ts
@@ -8,6 +8,7 @@ interface Post {
   authorId: number;
   likes?: number | undefined;
   likedBy?: Like[] | undefined;
+  edited?: boolean | undefined;
 }
 
 const Post: z.ZodType<Post> = z.object({
@@ -17,6 +18,7 @@ const Post: z.ZodType<Post> = z.object({
   authorId: z.number(),
   likes: z.number().optional(),
   likedBy: z.array(Like).optional(),
+  edited: z.boolean().optional(),
 });
 
 export { Post };