diff --git a/src/app/components/ChatCompose.svelte b/src/app/components/ChatCompose.svelte
index 3e93a34..f8726c8 100644
--- a/src/app/components/ChatCompose.svelte
+++ b/src/app/components/ChatCompose.svelte
@@ -10,11 +10,10 @@
   import {makeEditor} from "@app/editor"
 
   type Props = {
-    url?: string
     onSubmit: (event: EventContent) => void
   }
 
-  const {onSubmit, url}: Props = $props()
+  const {onSubmit}: Props = $props()
 
   const autofocus = !isMobile
 
@@ -39,11 +38,11 @@
   }
 
   const editor = makeEditor({
-    url,
     autofocus,
     submit,
     uploading,
     aggressive: true,
+    encryptFiles: true,
   })
 </script>
 
diff --git a/src/app/components/ContentEmoji.svelte b/src/app/components/ContentEmoji.svelte
index 1c29deb..4c9b848 100644
--- a/src/app/components/ContentEmoji.svelte
+++ b/src/app/components/ContentEmoji.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
   import type {ParsedEmojiValue} from "@welshman/content"
-  import {imgproxy} from "@app/core/state"
 
   export let value: ParsedEmojiValue
 
@@ -8,10 +7,7 @@
 </script>
 
 {#if value.url}
-  <img
-    {alt}
-    src={imgproxy(value.url, {w: 24, h: 24})}
-    class="-mt-0.5 inline h-[1em] min-w-[1em] align-middle" />
+  <img {alt} src={value.url} class="-mt-0.5 inline h-[1em] min-w-[1em] align-middle" />
 {:else}
   {alt}
 {/if}
diff --git a/src/app/components/ContentLinkBlock.svelte b/src/app/components/ContentLinkBlock.svelte
index 25efe43..5810148 100644
--- a/src/app/components/ContentLinkBlock.svelte
+++ b/src/app/components/ContentLinkBlock.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import {ellipsize, displayUrl, postJson} from "@welshman/lib"
-  import {dufflepud, imgproxy} from "@app/core/state"
+  import {dufflepud} from "@app/core/state"
   import {preventDefault, stopPropagation} from "@lib/html"
   import Link from "@lib/components/Link.svelte"
   import ContentLinkDetail from "@app/components/ContentLinkDetail.svelte"
@@ -51,7 +51,7 @@
             <img
               alt="Link preview"
               onerror={onError}
-              src={imgproxy(preview.image)}
+              src={preview.image}
               class="bg-alt max-h-72 rounded-t-box object-contain object-center" />
           {/if}
           <div class="flex flex-col gap-2 p-4">
diff --git a/src/app/components/ContentLinkBlockImage.svelte b/src/app/components/ContentLinkBlockImage.svelte
index 73e84ed..26addce 100644
--- a/src/app/components/ContentLinkBlockImage.svelte
+++ b/src/app/components/ContentLinkBlockImage.svelte
@@ -1,10 +1,17 @@
 <script lang="ts">
   import {onMount, onDestroy} from "svelte"
   import {displayUrl} from "@welshman/lib"
-  import {getTags, decryptFile, getTagValue, tagsFromIMeta} from "@welshman/util"
+  import {
+    getTags,
+    getBlob,
+    decryptFile,
+    getTagValue,
+    tagsFromIMeta,
+    makeBlossomAuthEvent,
+  } from "@welshman/util"
+  import {signer} from "@welshman/app"
   import LinkRound from "@assets/icons/link-round.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
-  import {imgproxy} from "@app/core/state"
 
   const {value, event, ...props} = $props()
 
@@ -14,18 +21,34 @@
       .map(tagsFromIMeta)
       .find(meta => getTagValue("url", meta) === url) || event.tags
 
+  const hash = getTagValue("x", meta)
   const key = getTagValue("decryption-key", meta)
   const nonce = getTagValue("decryption-nonce", meta)
   const algorithm = getTagValue("encryption-algorithm", meta)
 
-  const onError = () => {
-    hasError = true
+  const onError = async () => {
+    // If the image failed to load, try authenticating
+    if (hash && $signer) {
+      const server = new URL(url).origin
+      const template = makeBlossomAuthEvent({action: "get", server, hashes: [hash]})
+      const authEvent = await $signer.sign(template)
+      const res = await getBlob(server, hash, {authEvent})
+
+      if (res.status === 200) {
+        src = URL.createObjectURL(await res.blob())
+      } else {
+        hasError = true
+      }
+    } else {
+      hasError = true
+    }
   }
 
   let hasError = $state(false)
-  let src = $state(imgproxy(url))
+  let src = $state("")
 
   onMount(async () => {
+    // If we have an encryption algorithm, fetch and decrypt
     if (algorithm === "aes-gcm" && key && nonce) {
       const response = await fetch(url)
 
@@ -35,6 +58,8 @@
 
         src = URL.createObjectURL(new Blob([decryptedData]))
       }
+    } else {
+      src = url
     }
   })
 
@@ -48,6 +73,6 @@
     <Icon icon={LinkRound} size={3} class="inline-block" />
     {displayUrl(url)}
   </a>
-{:else}
+{:else if src}
   <img alt="" {src} onerror={onError} {...props} />
 {/if}
diff --git a/src/app/core/state.ts b/src/app/core/state.ts
index db35ab1..fff4e1a 100644
--- a/src/app/core/state.ts
+++ b/src/app/core/state.ts
@@ -148,8 +148,6 @@ export const DEFAULT_PUBKEYS = import.meta.env.VITE_DEFAULT_PUBKEYS
 
 export const DUFFLEPUD_URL = "https://dufflepud.onrender.com"
 
-export const IMGPROXY_URL = "https://imgproxy.coracle.social"
-
 export const NIP46_PERMS =
   "nip44_encrypt,nip44_decrypt," +
   [CLIENT_AUTH, AUTH_JOIN, MESSAGE, THREAD, COMMENT, ROOMS, WRAP, REACTION, ZAP_REQUEST]
@@ -180,20 +178,6 @@ export const colors = [
 
 export const dufflepud = (path: string) => DUFFLEPUD_URL + "/" + path
 
-export const imgproxy = (url: string, {w = 640, h = 1024} = {}) => {
-  if (!url || url.match("gif$")) {
-    return url
-  }
-
-  url = url.split("?")[0]
-
-  try {
-    return url ? `${IMGPROXY_URL}/x/s:${w}:${h}/${btoa(url)}` : url
-  } catch (e) {
-    return url
-  }
-}
-
 export const entityLink = (entity: string) => `https://coracle.social/${entity}`
 
 export const pubkeyLink = (pubkey: string, relays = Router.get().FromPubkeys([pubkey]).getUrls()) =>
@@ -533,6 +517,11 @@ export const chats = derived(
     const messagesByChatId = new Map<string, TrustedEvent[]>()
 
     for (const message of $messages) {
+      // Filter out messages we sent but aren't addressed to the user
+      if (!getPubkeyTagValues(message.wrap?.tags || []).includes($pubkey!)) {
+        continue
+      }
+
       const chatId = makeChatId(getPubkeyTagValues(message.tags).concat(message.pubkey))
 
       pushToMapKey(messagesByChatId, chatId, message)
diff --git a/src/app/editor/index.ts b/src/app/editor/index.ts
index e8c1d03..465ccf5 100644
--- a/src/app/editor/index.ts
+++ b/src/app/editor/index.ts
@@ -11,6 +11,7 @@ import {uploadFile} from "@app/core/commands"
 import {pushToast} from "@app/util/toast"
 
 export const makeEditor = async ({
+  encryptFiles = false,
   aggressive = false,
   autofocus = false,
   charCount,
@@ -21,6 +22,7 @@ export const makeEditor = async ({
   uploading,
   wordCount,
 }: {
+  encryptFiles?: boolean
   aggressive?: boolean
   autofocus?: boolean
   charCount?: Writable<number>
@@ -51,7 +53,8 @@ export const makeEditor = async ({
           },
           fileUpload: {
             config: {
-              upload: (attrs: FileAttributes) => uploadFile(attrs.file, {url, encrypt: true}),
+              upload: (attrs: FileAttributes) =>
+                uploadFile(attrs.file, {url, encrypt: encryptFiles}),
               onDrop: () => uploading?.set(true),
               onComplete: () => uploading?.set(false),
               onUploadError(currentEditor, task) {