diff --git a/src/components/Dashboard/Management/EmailMessages/EmailMessageInfo.jsx b/src/components/Dashboard/Management/EmailMessages/EmailMessageInfo.jsx
index 3f89ecfc..798218b1 100644
--- a/src/components/Dashboard/Management/EmailMessages/EmailMessageInfo.jsx
+++ b/src/components/Dashboard/Management/EmailMessages/EmailMessageInfo.jsx
@@ -158,7 +158,9 @@ const EmailMessageInfo = () => {
                       spinning={objectFormState.loading}
                       indicator={<LoadingOutlined />}
                     >
-                      <Card>
+                      <Card
+                        styles={{ body: { height: 'calc(100vh - 218px)' } }}
+                      >
                         <TemplatePreview
                           template={objectData?.template}
                           content={objectData?.content}
diff --git a/src/components/Dashboard/Management/Files/FileInfo.jsx b/src/components/Dashboard/Management/Files/FileInfo.jsx
index 20cc6005..7274948e 100644
--- a/src/components/Dashboard/Management/Files/FileInfo.jsx
+++ b/src/components/Dashboard/Management/Files/FileInfo.jsx
@@ -30,7 +30,10 @@ import { ApiServerContext } from '../../context/ApiServerContext.jsx'
 import ScrollBox from '../../common/ScrollBox.jsx'
 import JsonObjectIcon from '../../../Icons/JsonObjectIcon.jsx'
 import ObjectProperty from '../../common/ObjectProperty.jsx'
-import { getModelProperty, getModelByName } from '../../../../database/ObjectModels.js'
+import {
+  getModelProperty,
+  getModelByName
+} from '../../../../database/ObjectModels.js'
 
 const log = loglevel.getLogger('FileInfo')
 log.setLevel(config.logLevel)
@@ -87,7 +90,7 @@ const FileInfo = () => {
     download: () => {
       fetchFileContent(objectFormState?.objectData, true)
       return true
-    },
+    }
   }
 
   return (
@@ -102,7 +105,7 @@ const FileInfo = () => {
             <Space size='small'>
               <ObjectActions
                 type='file'
-              pageName='info'
+                pageName='info'
                 id={fileId}
                 disabled={objectFormState.loading}
                 objectData={objectFormState.objectData}
@@ -203,7 +206,7 @@ const FileInfo = () => {
               collapseKey='preview'
             >
               {objectFormState?.objectData?._id ? (
-                <Card>
+                <Card styles={{ body: { minHeight: 'calc(100vh - 218px)' } }}>
                   <FilePreview
                     file={objectFormState?.objectData}
                     style={{ width: '100%', height: '100%' }}
@@ -243,7 +246,7 @@ const FileInfo = () => {
                 indicator={<LoadingOutlined />}
               >
                 <Card>
-                <NotesPanel _id={fileId} type='file' />
+                  <NotesPanel _id={fileId} type='file' />
                 </Card>
               </Spin>
             </InfoCollapse>
@@ -262,10 +265,7 @@ const FileInfo = () => {
                 <ObjectTable
                   type='auditLog'
                   masterFilter={{
-                      parent:
-                        getModelByName('file').prefix +
-                        ':' +
-                        fileId
+                    parent: getModelByName('file').prefix + ':' + fileId
                   }}
                   visibleColumns={{ _id: false, parent: false }}
                 />
diff --git a/src/components/Dashboard/common/FilePreview.jsx b/src/components/Dashboard/common/FilePreview.jsx
index 73f5e3b6..55df8cf5 100644
--- a/src/components/Dashboard/common/FilePreview.jsx
+++ b/src/components/Dashboard/common/FilePreview.jsx
@@ -11,12 +11,14 @@ import {
 import LoadingPlaceholder from './LoadingPlaceholder'
 import GCodePreview from './GCodePreview'
 import ThreeDPreview from './ThreeDPreview'
+import PDFPreview from './PDFPreview'
 import { AuthContext } from '../context/AuthContext'
 
+const hasExplicitPreviewHeight = (height) =>
+  typeof height === 'number' ||
+  (typeof height === 'string' && height !== '100%' && height !== 'auto')
+
 const FilePreview = ({ file, style = {} }) => {
-  useEffect(() => {
-    console.log('FILEPREVIEWFILE', file)
-  }, [file])
   const { token } = useContext(AuthContext)
   const { fetchFileContent } = useContext(ApiServerContext)
 
@@ -26,6 +28,13 @@ const FilePreview = ({ file, style = {} }) => {
 
   const currentId = useRef(null)
 
+  const extension = (file?.extension || '').toLowerCase()
+  const isGcode = ['.g', '.gcode'].includes(extension)
+  const is3DModel = ['.stl', '.3mf'].includes(extension)
+  const isImage = file?.type?.startsWith('image/') || false
+  const isPdf =
+    file?.type?.startsWith('application/pdf') || extension === '.pdf'
+
   const fetchPreview = useCallback(async () => {
     if (error != null) {
       return
@@ -49,6 +58,25 @@ const FilePreview = ({ file, style = {} }) => {
     }
   }, [file._id, file?.type, fetchPreview, token])
 
+  if (isPdf) {
+    if (error != null) {
+      return <div style={{ color: 'red' }}>{error}</div>
+    }
+
+    return (
+      <PDFPreview
+        file={fileObjectUrl}
+        loading={loading}
+        style={{
+          ...style,
+          height: hasExplicitPreviewHeight(style.height)
+            ? style.height
+            : '72vh'
+        }}
+      />
+    )
+  }
+
   if (loading == true || !file?.type) {
     return <LoadingPlaceholder message={'Loading file preview...'} />
   }
@@ -57,14 +85,6 @@ const FilePreview = ({ file, style = {} }) => {
     return <div style={{ color: 'red' }}>{error}</div>
   }
 
-  const isGcode =
-    ['.g', '.gcode'].includes((file?.extension || '').toLowerCase()) || false
-
-  const is3DModel =
-    ['.stl', '.3mf'].includes((file?.extension || '').toLowerCase()) || false
-
-  const isImage = file?.type.startsWith('image/')
-
   if (isGcode && fileObjectUrl) {
     return (
       <GCodePreview
diff --git a/src/components/Dashboard/common/PDFPreview.jsx b/src/components/Dashboard/common/PDFPreview.jsx
index a1b7ceb9..aa58a94b 100644
--- a/src/components/Dashboard/common/PDFPreview.jsx
+++ b/src/components/Dashboard/common/PDFPreview.jsx
@@ -35,16 +35,9 @@ const PDFPreview = ({ file, loading = false, style }) => {
           }}
           disabled={loading}
         />
-        <Button
-          icon={<MinusIcon />}
-          onClick={() => {
-            setPreviewScale((prev) => clampPreviewScale(prev - 0.05))
-          }}
-          disabled={loading}
-        />
         <Button
           readOnly={true}
-          style={{ width: '65px' }}
+          style={{ minWidth: '70px' }}
           disabled={loading}
           onClick={() => {
             setPreviewScale(1)
@@ -52,6 +45,13 @@ const PDFPreview = ({ file, loading = false, style }) => {
         >
           {previewScale.toFixed(2)}x
         </Button>
+        <Button
+          icon={<MinusIcon />}
+          onClick={() => {
+            setPreviewScale((prev) => clampPreviewScale(prev - 0.05))
+          }}
+          disabled={loading}
+        />
       </Flex>
 
       <div
diff --git a/src/database/models/EmailMessage.js b/src/database/models/EmailMessage.js
index 5230a34a..d23cf21f 100644
--- a/src/database/models/EmailMessage.js
+++ b/src/database/models/EmailMessage.js
@@ -242,7 +242,7 @@ export const EmailMessage = {
     },
     {
       name: 'recipientEmail',
-      label: 'Recipient',
+      label: 'Recipient Email',
       type: 'email',
       required: true,
       readOnly: readOnlyAfterCreate,
@@ -278,7 +278,7 @@ export const EmailMessage = {
     },
     {
       name: 'recipient',
-      label: 'Recipient Object',
+      label: 'Recipient',
       type: 'object',
       objectType: (data) => data?.recipientType,
       readOnly: readOnlyAfterCreate,
diff --git a/src/database/models/File.js b/src/database/models/File.js
index 131056c6..cf2b0890 100644
--- a/src/database/models/File.js
+++ b/src/database/models/File.js
@@ -156,6 +156,13 @@ export const File = {
       readOnly: true,
       columnWidth: 180
     },
+    {
+      name: 'updatedAt',
+      label: 'Updated At',
+      type: 'dateTime',
+      readOnly: true,
+      columnWidth: 200
+    },
     {
       name: 'name',
       label: 'Name',
@@ -164,13 +171,7 @@ export const File = {
       type: 'text',
       columnWidth: 200
     },
-    {
-      name: 'updatedAt',
-      label: 'Updated At',
-      type: 'dateTime',
-      readOnly: true,
-      columnWidth: 200
-    },
+
     {
       name: 'type',
       label: 'Type',