diff --git a/src/app.tsx b/src/app.tsx
index 0c84b62b7..b054dcb44 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -16,8 +16,8 @@ import ProfileView from "./views/profile";
 import HashTagView from "./views/hashtag";
 import ThreadView from "./views/note";
 import NotificationsView from "./views/notifications";
-import DirectMessagesView from "./views/messages";
-import DirectMessageChatView from "./views/messages/chat";
+import DirectMessagesView from "./views/dms";
+import DirectMessageChatView from "./views/dms/chat";
 
 import SigninView from "./views/signin";
 import SignupView from "./views/signup";
diff --git a/src/components/chat-windows/chat-window.tsx b/src/components/chat-windows/chat-window.tsx
index 29d216da4..9f69bc869 100644
--- a/src/components/chat-windows/chat-window.tsx
+++ b/src/components/chat-windows/chat-window.tsx
@@ -15,7 +15,7 @@ import { RelayMode } from "../../classes/relay";
 import { useTimelineCurserIntersectionCallback } from "../../hooks/use-timeline-cursor-intersection-callback";
 import IntersectionObserverProvider from "../../providers/intersection-observer";
 import useSubject from "../../hooks/use-subject";
-import Message from "../../views/messages/message";
+import Message from "../../views/dms/message";
 import { LightboxProvider } from "../lightbox-provider";
 import { useSigningContext } from "../../providers/signing-provider";
 import { DraftNostrEvent } from "../../types/nostr-event";
diff --git a/src/components/embed-event/event-types/embedded-dm.tsx b/src/components/embed-event/event-types/embedded-dm.tsx
index a01d3a668..248001437 100644
--- a/src/components/embed-event/event-types/embedded-dm.tsx
+++ b/src/components/embed-event/event-types/embedded-dm.tsx
@@ -5,8 +5,8 @@ import { TrustProvider } from "../../../providers/trust";
 import UserAvatarLink from "../../user-avatar-link";
 import UserLink from "../../user-link";
 import Timestamp from "../../timestamp";
-import DecryptPlaceholder from "../../../views/messages/decrypt-placeholder";
-import { MessageContent } from "../../../views/messages/message";
+import DecryptPlaceholder from "../../../views/dms/decrypt-placeholder";
+import { MessageContent } from "../../../views/dms/message";
 import { getMessageRecipient } from "../../../services/direct-messages";
 import useCurrentAccount from "../../../hooks/use-current-account";
 
diff --git a/src/views/messages/chat.tsx b/src/views/dms/chat.tsx
similarity index 100%
rename from src/views/messages/chat.tsx
rename to src/views/dms/chat.tsx
diff --git a/src/views/messages/decrypt-placeholder.tsx b/src/views/dms/decrypt-placeholder.tsx
similarity index 100%
rename from src/views/messages/decrypt-placeholder.tsx
rename to src/views/dms/decrypt-placeholder.tsx
diff --git a/src/views/messages/index.tsx b/src/views/dms/index.tsx
similarity index 100%
rename from src/views/messages/index.tsx
rename to src/views/dms/index.tsx
diff --git a/src/views/messages/message.tsx b/src/views/dms/message.tsx
similarity index 85%
rename from src/views/messages/message.tsx
rename to src/views/dms/message.tsx
index bba83f773..cbb1ef77c 100644
--- a/src/views/messages/message.tsx
+++ b/src/views/dms/message.tsx
@@ -1,5 +1,5 @@
 import { useRef } from "react";
-import { Box, ButtonGroup, Card, CardBody, CardFooter, CardHeader, CardProps, Flex } from "@chakra-ui/react";
+import { Box, BoxProps, ButtonGroup, Card, CardBody, CardFooter, CardHeader, CardProps, Flex } from "@chakra-ui/react";
 
 import useCurrentAccount from "../../hooks/use-current-account";
 import { getMessageRecipient } from "../../services/direct-messages";
@@ -25,7 +25,7 @@ import useEventReactions from "../../hooks/use-event-reactions";
 import AddReactionButton from "../../components/note/components/add-reaction-button";
 import { TrustProvider } from "../../providers/trust";
 
-export function MessageContent({ event, text }: { event: NostrEvent; text: string }) {
+export function MessageContent({ event, text, children, ...props }: { event: NostrEvent; text: string } & BoxProps) {
   let content: EmbedableContent = [text];
 
   content = embedNostrLinks(content);
@@ -36,8 +36,9 @@ export function MessageContent({ event, text }: { event: NostrEvent; text: strin
 
   return (
     <TrustProvider event={event}>
-      <Box whiteSpace="pre-wrap" display="inline">
+      <Box whiteSpace="pre-wrap" {...props}>
         {content}
+        {children}
       </Box>
     </TrustProvider>
   );
@@ -72,9 +73,12 @@ export default function Message({ event }: { event: NostrEvent } & Omit<CardProp
             variant="link"
             py="4"
           >
-            {(text) => <MessageContent event={event} text={text} />}
+            {(text) => (
+              <MessageContent event={event} text={text} display="inline">
+                {reactions.length === 0 && <Timestamp float="right" timestamp={event.created_at} />}
+              </MessageContent>
+            )}
           </DecryptPlaceholder>
-          {reactions.length === 0 && <Timestamp float="right" timestamp={event.created_at} />}
         </CardBody>
         {reactions.length > 0 && (
           <CardFooter alignItems="center" display="flex" gap="2" px="2" pt="0" pb="2">
diff --git a/src/views/messages/send-message-form.tsx b/src/views/dms/send-message-form.tsx
similarity index 100%
rename from src/views/messages/send-message-form.tsx
rename to src/views/dms/send-message-form.tsx