diff --git a/components/email/ComposeEmail.tsx b/components/email/ComposeEmail.tsx
index dbc4bdd0..de0cc362 100644
--- a/components/email/ComposeEmail.tsx
+++ b/components/email/ComposeEmail.tsx
@@ -1,7 +1,7 @@
 'use client';
 
 import { useState, useRef, useEffect } from 'react';
-import { formatEmailForReplyOrForward, EmailMessage, EmailAddress } from '@/lib/services/email-service';
+import { formatEmailForReplyOrForward, EmailMessage, EmailAddress } from '@/lib/utils/email-formatter';
 import { X, Paperclip, ChevronDown, ChevronUp, SendHorizontal, Loader2 } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
@@ -162,13 +162,13 @@ export default function ComposeEmail({
       
       // Format the forwarded message with a well-structured header
       const fromString = Array.isArray(initialEmail.from) && initialEmail.from.length > 0
-        ? initialEmail.from.map(addr => addr.name 
+        ? initialEmail.from.map((addr: {name?: string, address: string}) => addr.name 
             ? `${addr.name} <${addr.address}>` 
             : addr.address).join(', ')
         : 'Unknown';
       
       const toString = Array.isArray(initialEmail.to) && initialEmail.to.length > 0
-        ? initialEmail.to.map(addr => addr.name 
+        ? initialEmail.to.map((addr: {name?: string, address: string}) => addr.name 
             ? `${addr.name} <${addr.address}>` 
             : addr.address).join(', ')
         : '';