diff --git a/src/app/components/chat/chat.service.ts b/src/app/components/chat/chat.service.ts
index ebd8347..1669871 100644
--- a/src/app/components/chat/chat.service.ts
+++ b/src/app/components/chat/chat.service.ts
@@ -20,7 +20,7 @@ export class ChatService implements OnDestroy {
     private isDecrypting = false;
     private recipientPublicKey: string;
     private message: string;
-    private decryptedPrivateKey:string;
+    private decryptedPrivateKey:string="";
     private _chat: BehaviorSubject<Chat | null> = new BehaviorSubject(null);
     private _chats: BehaviorSubject<Chat[] | null> = new BehaviorSubject(null);
     private _contact: BehaviorSubject<Contact | null> = new BehaviorSubject(null);
@@ -148,80 +148,26 @@ export class ChatService implements OnDestroy {
     }
 
     async getChats(): Promise<Observable<Chat[]>> {
-        try {
-            const storedChats = await this._indexedDBService.getAllChatsWithLastMessage();
-
-            if (storedChats && storedChats.length > 0) {
-                this.chatList = storedChats;
-                this._chats.next(this.chatList);
-
-                const pubkeys = storedChats.map(chat => chat.contact.pubKey);
-                console.log(pubkeys);
-
-                this.updateMetadataInChunks(pubkeys);
-            }
-        } catch (error) {
-            console.error('Error fetching or updating chats:', error);
-        }
-
         return this.getChatListStream();
     }
 
-    private async updateMetadataInChunks(pubkeys: string[]): Promise<void> {
-        try {
-            const chunkSize = 20;
-            for (let i = 0; i < pubkeys.length; i += chunkSize) {
-                const chunk = pubkeys.slice(i, i + chunkSize);
-
-                const metadataList = await this._metadataService.fetchMetadataForMultipleKeys(chunk);
-
-                metadataList.forEach(metadata => {
-                    this.updateContactInChats(metadata.pubkey, metadata.metadata);
-                });
-
-                await this.sleep(2000);
-            }
-        } catch (error) {
-            console.error('Error updating metadata for chats:', error);
-        }
-    }
-
-    private updateContactInChats(pubKey: string, updatedMetadata: any): void {
-        const chatToUpdate = this.chatList.find(chat => chat.contact.pubKey === pubKey);
-
-        if (chatToUpdate) {
-            chatToUpdate.contact = {
-                ...chatToUpdate.contact,
-                ...updatedMetadata
-            };
-
-            this.chatList = this.chatList.map(chat => chat.contact.pubKey === pubKey ? chatToUpdate : chat);
-
-            this._chats.next(this.chatList);
-
-            this._indexedDBService.saveChat(chatToUpdate);
-        }
-    }
-
-    private sleep(ms: number): Promise<void> {
-        return new Promise(resolve => setTimeout(resolve, ms));
-    }
-
     async InitSubscribeToChatList(): Promise<Observable<Chat[]>>
     {
         const pubkey = this._signerService.getPublicKey();
         const useExtension = await this._signerService.isUsingExtension();
-        this.decryptedPrivateKey = await this._signerService.getDecryptedSecretKey();
-        return this.subscribeToChatList(pubkey, useExtension, this.decryptedPrivateKey);
+        const useSecretKey = await this._signerService.isUsingSecretKey();
+
+        if (useSecretKey){this.decryptedPrivateKey = await this._signerService.getDecryptedSecretKey();
+}
+        return this.subscribeToChatList(pubkey, useExtension,useSecretKey, this.decryptedPrivateKey);
     }
 
-    subscribeToChatList(pubkey: string, useExtension: boolean, decryptedSenderPrivateKey: string): Observable<Chat[]> {
+    subscribeToChatList(pubkey: string, useExtension: boolean, useSecretKey:boolean, decryptedSenderPrivateKey: string): Observable<Chat[]> {
         this._relayService.ensureConnectedRelays().then(async () => {
-            const lastSavedTimestamp = await this._indexedDBService.getLastSavedTimestamp();
 
             const filters: Filter[] = [
-                { kinds: [EncryptedDirectMessage], authors: [pubkey], since: Math.floor(lastSavedTimestamp / 1000) },
-                { kinds: [EncryptedDirectMessage], '#p': [pubkey], since: Math.floor(lastSavedTimestamp / 1000) }
+                { kinds: [EncryptedDirectMessage], authors: [pubkey] },
+                { kinds: [EncryptedDirectMessage], '#p': [pubkey] }
             ];
 
             this._relayService.getPool().subscribeMany(this._relayService.getConnectedRelays(), filters, {
@@ -236,7 +182,7 @@ export class ChatService implements OnDestroy {
                     if (event.created_at > lastTimestamp) {
                         this.messageQueue.push(event);
 
-                        await this.processNextMessage(pubkey, useExtension, decryptedSenderPrivateKey);
+                        await this.processNextMessage(pubkey, useExtension,useSecretKey, decryptedSenderPrivateKey);
                     }
                 },
                 oneose: () => {
@@ -249,7 +195,7 @@ export class ChatService implements OnDestroy {
         return this.getChatListStream();
     }
 
-    private async processNextMessage(pubkey: string, useExtension: boolean, decryptedSenderPrivateKey: string): Promise<void> {
+    private async processNextMessage(pubkey: string, useExtension: boolean, useSecretKey: boolean, decryptedSenderPrivateKey: string): Promise<void> {
         if (this.isDecrypting || this.messageQueue.length === 0) return;
 
         this.isDecrypting = true;
@@ -266,9 +212,11 @@ export class ChatService implements OnDestroy {
 
                 if (!otherPartyPubKey) continue;
 
+
                 const decryptedMessage = await this.decryptReceivedMessage(
                     event,
                     useExtension,
+                    useSecretKey,
                     decryptedSenderPrivateKey,
                     otherPartyPubKey
                 );
@@ -277,12 +225,7 @@ export class ChatService implements OnDestroy {
                     const messageTimestamp = event.created_at;
                     this.addOrUpdateChatList(otherPartyPubKey, decryptedMessage, messageTimestamp, isSentByUser);
 
-                    const chatToUpdate = this.chatList.find(chat => chat.id === otherPartyPubKey);
-                    if (chatToUpdate) {
-                        await this._indexedDBService.saveChat(chatToUpdate);
-                        await this._indexedDBService.saveLastSavedTimestamp(messageTimestamp * 1000);
-                        this._chat.next(chatToUpdate);
-                    }
+
                 }
             }
         } catch (error) {
@@ -293,6 +236,7 @@ export class ChatService implements OnDestroy {
     }
 
 
+
     private addOrUpdateChatList(pubKey: string, message: string, createdAt: number, isMine: boolean): void {
         const existingChat = this.chatList.find(chat => chat.contact?.pubKey === pubKey);
 
@@ -336,8 +280,7 @@ export class ChatService implements OnDestroy {
                 messages: [newMessage]
             };
             this.chatList.push(newChat);
-            this.fetchMetadataForPubKey(pubKey);
-        }
+         }
 
         this.chatList.sort((a, b) => Number(b.lastMessageAt!) - Number(a.lastMessageAt!));
 
@@ -345,19 +288,7 @@ export class ChatService implements OnDestroy {
     }
 
 
-    private fetchMetadataForPubKey(pubKey: string): void {
-        this._metadataService.fetchMetadataWithCache(pubKey)
-            .then(metadata => {
-                const chat = this.chatList.find(chat => chat.contact?.pubKey === pubKey);
-                if (chat && metadata) {
-                    chat.contact = { ...chat.contact, ...metadata };
-                    this._chats.next(this.chatList);
-                }
-            })
-            .catch(error => {
-                console.error(`Failed to fetch metadata for pubKey: ${pubKey}`, error);
-            });
-    }
+
 
     getChatListStream(): Observable<Chat[]> {
         return this._chats.asObservable();
@@ -366,12 +297,13 @@ export class ChatService implements OnDestroy {
     private async decryptReceivedMessage(
         event: NostrEvent,
         useExtension: boolean,
+        useSecretKey:boolean,
         decryptedSenderPrivateKey: string,
         recipientPublicKey: string
     ): Promise<string> {
         if (useExtension) {
             return await this._signerService.decryptMessageWithExtension(recipientPublicKey, event.content);
-        } else {
+        } else if(useSecretKey){
             return await this._signerService.decryptMessage(decryptedSenderPrivateKey, recipientPublicKey, event.content);
         }
     }
@@ -388,10 +320,12 @@ export class ChatService implements OnDestroy {
             onevent: async (event: NostrEvent) => {
                 const isSentByMe = event.pubkey === myPubKey;
                 const senderOrRecipientPubKey = isSentByMe ? pubKey : event.pubkey;
-
+                const useExtension = await this._signerService.isUsingExtension();
+                const useSecretKey = await this._signerService.isUsingSecretKey();
                 const decryptedMessage = await this.decryptReceivedMessage(
                     event,
-                    await this._signerService.isUsingExtension(),
+                    useExtension,
+                    useSecretKey,
                     this.decryptedPrivateKey,
                     senderOrRecipientPubKey
                 );
@@ -404,7 +338,6 @@ export class ChatService implements OnDestroy {
                 }
             },
             oneose: () => {
-                console.log(`Closed subscription for loading history of chat: ${pubKey}`);
             }
         });
     }
diff --git a/src/app/components/chat/chats/chats.component.html b/src/app/components/chat/chats/chats.component.html
index 7201a12..9048fc7 100644
--- a/src/app/components/chat/chats/chats.component.html
+++ b/src/app/components/chat/chats/chats.component.html
@@ -1,20 +1,16 @@
 <div class="bg-card relative flex w-full flex-auto dark:bg-transparent">
     <mat-drawer-container class="h-full flex-auto" [hasBackdrop]="false">
         <!-- Drawer -->
-        <mat-drawer
-            class="w-full dark:bg-gray-900 sm:w-100 lg:border-r lg:shadow-none"
-            [autoFocus]="false"
-            [(opened)]="drawerOpened"
-            #drawer
-        >
+        <mat-drawer class="w-full dark:bg-gray-900 sm:w-100 lg:border-r lg:shadow-none" [autoFocus]="false"
+            [(opened)]="drawerOpened" #drawer>
             <!-- New chat -->
             @if (drawerComponent === 'new-chat') {
-                <chat-new-chat [drawer]="drawer"></chat-new-chat>
+            <chat-new-chat [drawer]="drawer"></chat-new-chat>
             }
 
             <!-- Profile -->
             @if (drawerComponent === 'profile') {
-                <chat-profile [drawer]="drawer"></chat-profile>
+            <chat-profile [drawer]="drawer"></chat-profile>
             }
         </mat-drawer>
 
@@ -22,268 +18,179 @@
         <mat-drawer-content class="flex overflow-hidden">
             <!-- Chats list -->
             @if (chats && chats.length > 0) {
-                <div
-                    class="bg-card relative flex w-full min-w-0 flex-auto flex-col dark:bg-transparent lg:min-w-100 lg:max-w-100"
-                >
-                    <!-- Header -->
-                    <div
-                        class="flex flex-0 flex-col border-b bg-gray-50 px-8 py-4 dark:bg-transparent"
-                    >
-                        <div class="flex items-center">
-                            <div
-                                class="mr-1 flex cursor-pointer items-center"
-                                (click)="openProfile()"
-                            >
-                                <div class="h-10 w-10">
-                                    @if (profile.picture) {
-                                        <img
-                                            class="h-full w-full rounded-full object-cover"
-                                            [src]="profile.picture"
-                                            alt="Profile picture"
-                                        />
-                                    }
-                                    @if (!profile.picture) {
-                                        <div
-                                            class="flex h-full w-full items-center justify-center rounded-full bg-gray-200 text-lg uppercase text-gray-600 dark:bg-gray-700 dark:text-gray-200"
-                                        >
-                                            {{ profile.name.charAt(0) }}
-                                        </div>
-                                    }
-                                </div>
-                                <div class="ml-4 truncate font-medium">
-                                    {{ profile.name }}
+            <div
+                class="bg-card relative flex w-full min-w-0 flex-auto flex-col dark:bg-transparent lg:min-w-100 lg:max-w-100">
+                <!-- Header -->
+                <div class="flex flex-0 flex-col border-b bg-gray-50 px-8 py-4 dark:bg-transparent">
+                    <div class="flex items-center">
+                        <div class="mr-1 flex cursor-pointer items-center" (click)="openProfile()">
+                            <div class="h-10 w-10">
+                                @if (profile.picture) {
+                                <img class="h-full w-full rounded-full object-cover" [src]="profile.picture"
+                                    onerror="this.onerror=null; this.src='/images/avatars/avatar-placeholder.png';"
+                                    alt="Profile picture" />
+                                }
+                                @if (!profile.picture) {
+                                <div
+                                    class="flex h-full w-full items-center justify-center rounded-full bg-gray-200 text-lg uppercase text-gray-600 dark:bg-gray-700 dark:text-gray-200">
+                                    {{ profile.name.charAt(0) }}
                                 </div>
+                                }
+                            </div>
+                            <div class="ml-4 truncate font-medium">
+                                {{ profile.name }}
                             </div>
-                            <button
-                                class="ml-auto"
-                                mat-icon-button
-                                (click)="openNewChat()"
-                            >
-                                <mat-icon
-                                    [svgIcon]="'heroicons_outline:plus-circle'"
-                                ></mat-icon>
-                            </button>
-                            <button
-                                class="-mr-4 ml-1"
-                                mat-icon-button
-                                [matMenuTriggerFor]="chatsHeaderMenu"
-                            >
-                                <mat-icon
-                                    [svgIcon]="
+                        </div>
+                        <button class="ml-auto" mat-icon-button (click)="openNewChat()">
+                            <mat-icon [svgIcon]="'heroicons_outline:plus-circle'"></mat-icon>
+                        </button>
+                        <button class="-mr-4 ml-1" mat-icon-button [matMenuTriggerFor]="chatsHeaderMenu">
+                            <mat-icon [svgIcon]="
                                         'heroicons_outline:ellipsis-vertical'
-                                    "
-                                ></mat-icon>
-                                <mat-menu #chatsHeaderMenu>
-                                    <button mat-menu-item>
-                                        <mat-icon
-                                            [svgIcon]="
+                                    "></mat-icon>
+                            <mat-menu #chatsHeaderMenu>
+                                <button mat-menu-item>
+                                    <mat-icon [svgIcon]="
                                                 'heroicons_outline:user-group'
-                                            "
-                                        ></mat-icon>
-                                        New group
-                                    </button>
-                                    <button mat-menu-item>
-                                        <mat-icon
-                                            [svgIcon]="
+                                            "></mat-icon>
+                                    New group
+                                </button>
+                                <button mat-menu-item>
+                                    <mat-icon [svgIcon]="
                                                 'heroicons_outline:chat-bubble-left-right'
-                                            "
-                                        ></mat-icon>
-                                        Create a room
-                                    </button>
-                                    <button
-                                        mat-menu-item
-                                        (click)="openProfile()"
-                                    >
-                                        <mat-icon
-                                            [svgIcon]="
+                                            "></mat-icon>
+                                    Create a room
+                                </button>
+                                <button mat-menu-item (click)="openProfile()">
+                                    <mat-icon [svgIcon]="
                                                 'heroicons_outline:user-circle'
-                                            "
-                                        ></mat-icon>
-                                        Profile
-                                    </button>
-                                    <button mat-menu-item>
-                                        <mat-icon
-                                            [svgIcon]="
+                                            "></mat-icon>
+                                    Profile
+                                </button>
+                                <button mat-menu-item>
+                                    <mat-icon [svgIcon]="
                                                 'heroicons_outline:archive-box'
-                                            "
-                                        ></mat-icon>
-                                        Archived
-                                    </button>
-                                    <button mat-menu-item>
-                                        <mat-icon
-                                            [svgIcon]="'heroicons_outline:star'"
-                                        ></mat-icon>
-                                        Starred
-                                    </button>
-                                    <button mat-menu-item>
-                                        <mat-icon
-                                            [svgIcon]="
+                                            "></mat-icon>
+                                    Archived
+                                </button>
+                                <button mat-menu-item>
+                                    <mat-icon [svgIcon]="'heroicons_outline:star'"></mat-icon>
+                                    Starred
+                                </button>
+                                <button mat-menu-item>
+                                    <mat-icon [svgIcon]="
                                                 'heroicons_outline:cog-8-tooth'
-                                            "
-                                        ></mat-icon>
-                                        Settings
-                                    </button>
-                                </mat-menu>
-                            </button>
-                        </div>
-                        <!-- Search -->
-                        <div class="mt-4">
-                            <mat-form-field
-                                class="angor-mat-rounded angor-mat-dense w-full"
-                                [subscriptSizing]="'dynamic'"
-                            >
-                                <mat-icon
-                                    matPrefix
-                                    class="icon-size-5"
-                                    [svgIcon]="
+                                            "></mat-icon>
+                                    Settings
+                                </button>
+                            </mat-menu>
+                        </button>
+                    </div>
+                    <!-- Search -->
+                    <div class="mt-4">
+                        <mat-form-field class="angor-mat-rounded angor-mat-dense w-full" [subscriptSizing]="'dynamic'">
+                            <mat-icon matPrefix class="icon-size-5" [svgIcon]="
                                         'heroicons_solid:magnifying-glass'
-                                    "
-                                ></mat-icon>
-                                <input
-                                    matInput
-                                    [autocomplete]="'off'"
-                                    [placeholder]="'Search or start new chat'"
-                                    (input)="filterChats(searchField.value)"
-                                    #searchField
-                                />
-                            </mat-form-field>
-                        </div>
+                                    "></mat-icon>
+                            <input matInput [autocomplete]="'off'" [placeholder]="'Search or start new chat'"
+                                (input)="filterChats(searchField.value)" #searchField />
+                        </mat-form-field>
                     </div>
+                </div>
 
-                    <!-- Chats -->
-                    <div class="flex-auto overflow-y-auto">
-                        @if (filteredChats.length > 0) {
-                            @for (
-                                chat of filteredChats;
-                                track trackByFn($index, chat)
-                            ) {
-                                <a
-                                    class="z-20 flex cursor-pointer items-center border-b px-8 py-5"
-                                    [ngClass]="{
+                <!-- Chats -->
+                <div class="flex-auto overflow-y-auto">
+                    @if (filteredChats.length > 0) {
+                    @for (
+                    chat of filteredChats;
+                    track trackByFn($index, chat)
+                    ) {
+                    <a class="z-20 flex cursor-pointer items-center border-b px-8 py-5" [ngClass]="{
                                         'dark:hover:bg-hover hover:bg-gray-100':
                                             !selectedChat ||
                                             selectedChat.id !== chat.id,
                                         'bg-primary-50 dark:bg-hover':
                                             selectedChat &&
                                             selectedChat.id === chat.id,
-                                    }"
-                                    [routerLink]="[chat.id]"
-                                >
-                                    <div
-                                        class="relative flex h-10 w-10 flex-0 items-center justify-center"
-                                    >
-                                        @if (chat.unreadCount > 0) {
-                                            <div
-                                                class="ring-bg-card absolute bottom-0 right-0 -ml-0.5 h-2 w-2 flex-0 rounded-full bg-primary text-on-primary ring-2 dark:bg-primary-500 dark:ring-gray-900"
-                                                [class.ring-primary-50]="
+                                    }" [routerLink]="[chat.id]">
+                        <div class="relative flex h-10 w-10 flex-0 items-center justify-center">
+                            @if (chat.unreadCount > 0) {
+                            <div class="ring-bg-card absolute bottom-0 right-0 -ml-0.5 h-2 w-2 flex-0 rounded-full bg-primary text-on-primary ring-2 dark:bg-primary-500 dark:ring-gray-900"
+                                [class.ring-primary-50]="
                                                     selectedChat &&
                                                     selectedChat.id === chat.id
-                                                "
-                                            ></div>
-                                        }
-                                        @if (chat.contact.picture) {
-                                            <img
-                                                class="h-full w-full rounded-full object-cover"
-                                                [src]="chat.contact.picture"
-                                                alt="Contact picture"
-                                            />
-                                        }
-                                        @if (!chat.contact.picture) {
-                                            <div
-                                                class="flex h-full w-full items-center justify-center rounded-full bg-gray-200 text-lg uppercase text-gray-600 dark:bg-gray-700 dark:text-gray-200"
-                                            >
-                                                {{
-                                                    chat.contact.name.charAt(0)
-                                                }}
-                                            </div>
-                                        }
-                                    </div>
-                                    <div class="ml-4 min-w-0">
-                                        <div
-                                            class="truncate font-medium leading-5"
-                                        >
-                                            {{ chat.contact.name }}
-                                        </div>
-                                        <div
-                                            class="text-secondary truncate leading-5"
-                                            [class.text-primary]="
+                                                "></div>
+                            }
+                            <!-- If contact has a picture -->
+                            <img *ngIf="chat.contact?.picture" class="h-full w-full rounded-full object-cover"
+                                [src]="chat.contact.picture"
+                                (error)="this.src='/images/avatars/avatar-placeholder.png';" alt="Contact picture" />
+
+                            <!-- If contact doesn't have a picture, display the first letter of the name -->
+                            <div *ngIf="!chat.contact?.picture"
+                                class="flex h-full w-full items-center justify-center rounded-full bg-gray-200 text-lg uppercase text-gray-600 dark:bg-gray-700 dark:text-gray-200">
+                                {{ chat.contact?.name?.charAt(0) }}
+                            </div>
+
+                        </div>
+                        <div class="ml-4 min-w-0">
+                            <div class="truncate font-medium leading-5">
+                                {{ chat.contact.name }}
+                            </div>
+                            <div class="text-secondary truncate leading-5" [class.text-primary]="
                                                 chat.unreadCount > 0
-                                            "
-                                            [class.dark:text-primary-500]="
+                                            " [class.dark:text-primary-500]="
                                                 chat.unreadCount > 0
-                                            "
-                                        >
-                                            {{ chat.lastMessage }}
-                                        </div>
-                                    </div>
-                                    <div
-                                        class="ml-auto flex flex-col items-end self-start pl-2"
-                                    >
-                                    <div class="text-secondary text-sm leading-5 whitespace-nowrap overflow-hidden">
-                                            {{ chat.lastMessageAt | ago}}
-                                        </div>
-                                        @if (chat.muted) {
-                                            <mat-icon
-                                                class="text-hint icon-size-5"
-                                                [svgIcon]="
+                                            ">
+                                {{ chat.lastMessage }}
+                            </div>
+                        </div>
+                        <div class="ml-auto flex flex-col items-end self-start pl-2">
+                            <div class="text-secondary text-sm leading-5 whitespace-nowrap overflow-hidden">
+                                {{ chat.lastMessageAt | ago}}
+                            </div>
+                            @if (chat.muted) {
+                            <mat-icon class="text-hint icon-size-5" [svgIcon]="
                                                     'heroicons_solid:speaker-x-mark'
-                                                "
-                                            ></mat-icon>
-                                        }
-                                    </div>
-                                </a>
+                                                "></mat-icon>
                             }
-                        } @else {
-                            <div
-                                class="flex h-full flex-auto flex-col items-center justify-center"
-                            >
-                                <mat-icon
-                                    class="icon-size-24"
-                                    [svgIcon]="
+                        </div>
+                    </a>
+                    }
+                    } @else {
+                    <div class="flex h-full flex-auto flex-col items-center justify-center">
+                        <mat-icon class="icon-size-24" [svgIcon]="
                                         'heroicons_outline:chat-bubble-oval-left-ellipsis'
-                                    "
-                                ></mat-icon>
-                                <div
-                                    class="text-secondary mt-4 text-2xl font-semibold tracking-tight"
-                                >
-                                    No chats
-                                </div>
-                            </div>
-                        }
+                                    "></mat-icon>
+                        <div class="text-secondary mt-4 text-2xl font-semibold tracking-tight">
+                            No chats
+                        </div>
                     </div>
+                    }
                 </div>
+            </div>
             } @else {
-                <div
-                    class="flex h-full flex-auto flex-col items-center justify-center"
-                >
-                    <mat-icon
-                        class="icon-size-24"
-                        [svgIcon]="
+            <div class="flex h-full flex-auto flex-col items-center justify-center">
+                <mat-icon class="icon-size-24" [svgIcon]="
                             'heroicons_outline:chat-bubble-oval-left-ellipsis'
-                        "
-                    ></mat-icon>
-                    <div
-                        class="text-secondary mt-4 text-2xl font-semibold tracking-tight"
-                    >
-                        No chats
-                    </div>
+                        "></mat-icon>
+                <div class="text-secondary mt-4 text-2xl font-semibold tracking-tight">
+                    No chats
                 </div>
+            </div>
             }
 
             <!-- No chats template -->
 
             <!-- Conversation -->
             @if (chats && chats.length > 0) {
-                <div
-                    class="flex-auto border-l"
-                    [ngClass]="{
+            <div class="flex-auto border-l" [ngClass]="{
                         'absolute inset-0 z-20 flex lg:static lg:inset-auto':
                             selectedChat && selectedChat.id,
                         'hidden lg:flex': !selectedChat || !selectedChat.id,
-                    }"
-                >
-                    <router-outlet></router-outlet>
-                </div>
+                    }">
+                <router-outlet></router-outlet>
+            </div>
             }
         </mat-drawer-content>
     </mat-drawer-container>
diff --git a/src/app/components/chat/chats/chats.component.ts b/src/app/components/chat/chats/chats.component.ts
index eeaa32b..d7b150d 100644
--- a/src/app/components/chat/chats/chats.component.ts
+++ b/src/app/components/chat/chats/chats.component.ts
@@ -1,4 +1,4 @@
-import { NgClass } from '@angular/common';
+import { CommonModule, NgClass } from '@angular/common';
 import {
     ChangeDetectionStrategy,
     ChangeDetectorRef,
@@ -40,7 +40,8 @@ import { AgoPipe } from 'app/shared/ago.pipe';
         NgClass,
         RouterLink,
         RouterOutlet,
-        AgoPipe
+        AgoPipe,
+        CommonModule
     ],
 })
 export class ChatsComponent implements OnInit, OnDestroy {
@@ -97,8 +98,8 @@ export class ChatsComponent implements OnInit, OnDestroy {
                 // Mark for check
                 this._changeDetectorRef.markForCheck();
             });
-
             this._chatService.InitSubscribeToChatList();
+
         }
 
     /**
diff --git a/src/app/components/chat/contact-info/contact-info.component.html b/src/app/components/chat/contact-info/contact-info.component.html
index d5ad670..38a23ca 100644
--- a/src/app/components/chat/contact-info/contact-info.component.html
+++ b/src/app/components/chat/contact-info/contact-info.component.html
@@ -17,6 +17,7 @@
                     <img
                         class="h-full w-full rounded-full object-cover"
                         [src]="chat.contact.picture"
+                        onerror="this.onerror=null; this.src='/images/avatars/avatar-placeholder.png';"
                         [alt]="'Contact picture'"
                     />
                 }
diff --git a/src/app/components/chat/conversation/conversation.component.html b/src/app/components/chat/conversation/conversation.component.html
index b735841..edbb87a 100644
--- a/src/app/components/chat/conversation/conversation.component.html
+++ b/src/app/components/chat/conversation/conversation.component.html
@@ -49,6 +49,7 @@
                                 <img
                                     class="h-full w-full rounded-full object-cover"
                                     [src]="chat.contact.picture"
+                                    onerror="this.onerror=null; this.src='/images/avatars/avatar-placeholder.png';"
                                     alt="Contact picture"
                                 />
                             }
diff --git a/src/app/components/chat/new-chat/new-chat.component.html b/src/app/components/chat/new-chat/new-chat.component.html
index ebf9b5e..645c053 100644
--- a/src/app/components/chat/new-chat/new-chat.component.html
+++ b/src/app/components/chat/new-chat/new-chat.component.html
@@ -43,6 +43,7 @@
                             <img
                                 class="h-full w-full object-cover"
                                 [src]="contact.picture"
+                                onerror="this.onerror=null; this.src='/images/avatars/avatar-placeholder.png';"
                                 alt="Contact picture"
                             />
                         }
diff --git a/src/app/components/chat/profile/profile.component.html b/src/app/components/chat/profile/profile.component.html
index 4e54d8e..3ffcedf 100644
--- a/src/app/components/chat/profile/profile.component.html
+++ b/src/app/components/chat/profile/profile.component.html
@@ -31,6 +31,7 @@
                 <img
                     class="h-full w-full rounded-full object-cover"
                     [src]="profile.picture"
+                    onerror="this.onerror=null; this.src='/images/avatars/avatar-placeholder.png';"
                     [alt]="'Profile picture'"
                 />
             }
diff --git a/src/app/services/indexed-db.service.ts b/src/app/services/indexed-db.service.ts
index 937f419..7d392ae 100644
--- a/src/app/services/indexed-db.service.ts
+++ b/src/app/services/indexed-db.service.ts
@@ -15,8 +15,6 @@ export class IndexedDBService {
   private userStore: LocalForage;
   private projectsStore: LocalForage;
   private projectStatsStore: LocalForage;
-  private chatStore: LocalForage;
-  private timestampStore: LocalForage;
 
 
   constructor() {
@@ -45,22 +43,6 @@ export class IndexedDBService {
       description: 'Store for project statistics',
     });
 
-    this.chatStore = localForage.createInstance({
-        driver: localForage.INDEXEDDB,
-        name: 'angor-hub',
-        version: 1.0,
-        storeName: 'chats',
-        description: 'Store for chat information',
-      });
-
-      this.timestampStore = localForage.createInstance({
-        driver: localForage.INDEXEDDB,
-        name: 'angor-hub',
-        version: 1.0,
-        storeName: 'timestamps',
-        description: 'Store for last update timestamps',
-      });
-
 
     this.loadAllProjectsFromDB();
     this.loadAllProjectStatsFromDB();
@@ -233,99 +215,4 @@ export class IndexedDBService {
     }
   }
 
-
-  async saveChat(chat: Chat): Promise<void> {
-    try {
-      await this.chatStore.setItem(chat.id, chat);
-    } catch (error) {
-      console.error('Error saving chat to IndexedDB:', error);
-    }
-  }
-
-  async getChat(pubKey: string): Promise<Chat | null> {
-    try {
-      const chat = await this.chatStore.getItem<Chat>(pubKey);
-      if (chat) {
-        return chat;
-      } else {
-        console.warn(`Chat with pubKey ${pubKey} not found in IndexedDB.`);
-        return null;
-      }
-    } catch (error) {
-      console.error(`Error retrieving chat with pubKey ${pubKey} from IndexedDB:`, error);
-      return null;
-    }
-  }
-
-
-  async getAllChats(): Promise<Chat[]> {
-    try {
-      const chats: Chat[] = [];
-
-      await this.chatStore.iterate<Chat, void>((value) => {
-        chats.push(value);
-      });
-
-      chats.sort((a, b) => {
-        const dateA = Number(a.lastMessageAt);
-        const dateB = Number(b.lastMessageAt);
-        return dateB - dateA;
-      });
-
-      return chats;
-    } catch (error) {
-      console.error('Error getting chats from IndexedDB:', error);
-      return [];
-    }
-  }
-
-
-  async getAllChatsWithLastMessage(): Promise<Chat[]> {
-    try {
-        const chats: Chat[] = [];
-
-        await this.chatStore.iterate<Chat, void>((value) => {
-            const lastMessage = value.messages[value.messages.length - 1];
-
-            const chatWithLastMessage = {
-                ...value,
-                messages: [lastMessage]
-            };
-
-            chats.push(chatWithLastMessage);
-        });
-
-        chats.sort((a, b) => {
-            const dateA = Number(a.lastMessageAt);
-            const dateB = Number(b.lastMessageAt);
-            return dateB - dateA;
-        });
-
-        return chats;
-    } catch (error) {
-        console.error('Error getting chats with last message from IndexedDB:', error);
-        return [];
-    }
-}
-
-
-
-
-   async saveLastSavedTimestamp(timestamp: number): Promise<void> {
-    try {
-      await this.timestampStore.setItem('lastSavedTimestamp', timestamp);
-    } catch (error) {
-      console.error('Error saving last update timestamp in IndexedDB:', error);
-    }
-  }
-
-  async getLastSavedTimestamp(): Promise<number> {
-    try {
-      const timestamp = await this.timestampStore.getItem<number>('lastSavedTimestamp');
-      return timestamp || 0;
-    } catch (error) {
-      console.error('Error getting last saved timestamp from IndexedDB:', error);
-      return 0;
-    }
-  }
-}
+ }