update

backend/app/gpt_service.py

@@ -21,6 +21,8 @@ def generate_email_sequence(
     prompt_template: str,
     product_name: str,
     campaign_sequence: Optional[Dict[str, Any]] = None,
+    *,
+    sender_mailbox_name: Optional[str] = None,
 ) -> List[Dict]:
     """
     Generate a personalized email sequence for a contact using GPT.
@@ -46,6 +48,7 @@ def generate_email_sequence(
         industry = safe_str(contact.get("industry") or contact.get("Industry") or "")
         location = safe_str(contact.get("location") or contact.get("Location") or "")
         company_size = safe_str(contact.get("company_size") or contact.get("Company Size") or "")
+        signoff = (sender_mailbox_name or "").strip()
         
         # Validate required fields
         if not email:
@@ -125,17 +128,18 @@ Body: Hi {first_name},
 
 [email body content]
 
-Anna
+{{{{sender_name}}}}
 Email 2
-Subject: [subject line]
+Subject: [subject line — must be Re: followed by the EXACT same base subject text as Email 1, with no new topic]
 Body: Hi {first_name},
 
-[email body content]
+[email body content — write ONLY the new paragraphs for this touch; do not paste or quote prior emails here]
 
-Anna
+{{{{sender_name}}}}
 ... (continue for all {num_emails} emails, each starting with "Hi {first_name},")
 
-Remember: Use only the information provided above. Do not reference anything not explicitly mentioned."""
+Remember: Use only the information provided above. Do not reference anything not explicitly mentioned.
+For Email 2 onward, the subject line must stay on-thread: use "Re: <Email 1 subject without any leading Re:>"."""
             )
         else:
             # Use standard prompt for other products
@@ -154,8 +158,8 @@ Personalize this email template:
 {prompt_template}
 
 Replace all variables like {{first_name}}, {{company}}, {{sender_name}} with the actual information.
-Make it sound natural and personalized. Keep the same structure and format.
-If sender_name is not provided, use "Alex Thompson" as the sender name."""
+{f'For {{sender_name}}, use exactly this sender sign-off name (not the prospect): {signoff}' if signoff else 'If {{sender_name}} appears and no sender name was provided for this run, leave the literal token {{sender_name}} in the output.'}
+Make it sound natural and personalized. Keep the same structure and format."""
             if campaign_sequence and int(campaign_sequence.get("email_count") or 0) > 1:
                 n = int(campaign_sequence["email_count"])
                 titles = campaign_sequence.get("email_titles") or []
@@ -309,13 +313,14 @@ Touches in order:
             })
         
         # Replace template variables in all emails
+        repl_sender = signoff if signoff else ""
         for email_data in emails:
             email_data["body"] = email_data["body"].replace("{{first_name}}", first_name)
             email_data["body"] = email_data["body"].replace("{{company}}", company)
-            email_data["body"] = email_data["body"].replace("{{sender_name}}", "Alex Thompson")
+            email_data["body"] = email_data["body"].replace("{{sender_name}}", repl_sender)
             email_data["subject"] = email_data["subject"].replace("{{first_name}}", first_name)
             email_data["subject"] = email_data["subject"].replace("{{company}}", company)
-            email_data["subject"] = email_data["subject"].replace("{{sender_name}}", "Alex Thompson")
+            email_data["subject"] = email_data["subject"].replace("{{sender_name}}", repl_sender)
             
             # Ensure first name is in the greeting if it's missing
             # Fix cases where GPT generates "Hi," instead of "Hi {first_name},"
@@ -349,7 +354,9 @@ Touches in order:
         # Return a fallback email
         first_name = contact.get("first_name", contact.get("First Name", "there"))
         company = contact.get("company", contact.get("Company", contact.get("Organization", "your company")))
-        
+        fb = (sender_mailbox_name or "").strip()
+        tail = f"\n\nBest,\n{fb}" if fb else "\n\nBest,"
+
         return [{
             "first_name": first_name,
             "last_name": contact.get("last_name", contact.get("Last Name", "")),
@@ -359,7 +366,7 @@ Touches in order:
             "product": product_name,
             "email_number": 1,
             "subject": f"{first_name}, let's talk about {product_name}",
-            "email_content": f"Hi {first_name},\n\nI wanted to reach out about how {product_name} could benefit {company}.\n\nBest,\nAlex Thompson"
+            "email_content": f"Hi {first_name},\n\nI wanted to reach out about how {product_name} could benefit {company}.{tail}",
         }]
 
 
@@ -368,6 +375,8 @@ def generate_linkedin_sequence(
     prompt_template: str,
     product_name: str,
     campaign_sequence: Optional[Dict[str, Any]] = None,
+    *,
+    sender_linkedin_name: Optional[str] = None,
 ) -> List[Dict]:
     """
     Generate LinkedIn DM-style messages (connection note + follow-ups) for a contact.
@@ -395,6 +404,8 @@ def generate_linkedin_sequence(
         if not email:
             raise ValueError(f"Contact missing email address: {contact}")
 
+        li_sign = (sender_linkedin_name or "").strip()
+
         system_prompt = prompt_template
         li_actions: List[str] = []
         if campaign_sequence and isinstance(campaign_sequence.get("linkedin_actions"), list):
@@ -446,6 +457,8 @@ Contact Information:
 - Industry: {industry if industry else 'Not specified'}
 - Location: {location if location else 'Not specified'}
 
+{f'Sender first name / sign-off to use when addressing yourself (not the prospect): {li_sign}' if li_sign else 'If you sign with a name, output the literal token {{sender_name}} on its own line; the app substitutes the LinkedIn profile name.'}
+
 Generate exactly {num_messages} messages (no more, no fewer) following the rules in the system prompt.
 {plan_extra}
 CRITICAL: Write for LinkedIn DMs or connection notes — short, plain, professional. No email-style subjects.
@@ -478,7 +491,7 @@ Use the contact's real first name where a greeting is appropriate. Do not use pl
                 body = (
                     body.replace("{{first_name}}", first_name)
                     .replace("{{company}}", company)
-                    .replace("{{sender_name}}", "Anna")
+                    .replace("{{sender_name}}", li_sign if li_sign else "")
                 )
                 messages.append(
                     {
@@ -507,7 +520,7 @@ Use the contact's real first name where a greeting is appropriate. Do not use pl
             chunk = (
                 chunk.replace("{{first_name}}", first_name)
                 .replace("{{company}}", company)
-                .replace("{{sender_name}}", "Anna")
+                .replace("{{sender_name}}", li_sign if li_sign else "")
             )
             messages.append({"email_number": 1, "subject": "", "body": chunk})
 
@@ -538,6 +551,8 @@ Use the contact's real first name where a greeting is appropriate. Do not use pl
             contact.get("company") or contact.get("Company") or contact.get("Organization") or "your company"
         )
         email = safe_str(contact.get("email") or contact.get("Email") or "")
+        li_fb = (sender_linkedin_name or "").strip()
+        li_tail = f"\n\n{li_fb}" if li_fb else ""
         return [
             {
                 "first_name": fn,
@@ -548,7 +563,7 @@ Use the contact's real first name where a greeting is appropriate. Do not use pl
                 "product": product_name,
                 "email_number": 1,
                 "subject": "",
-                "email_content": f"Hi {fn},\n\nQuick note on {product_name} for {company} — happy to compare notes if useful.\n\nAnna",
+                "email_content": f"Hi {fn},\n\nQuick note on {product_name} for {company} — happy to compare notes if useful.{li_tail}",
             }
         ]
 

backend/app/main.py

@@ -2234,11 +2234,18 @@ async def generate_linkedin_campaign_sequences(
         GeneratedSequence.channel == "linkedin",
     ).delete()
 
+    urow = db.query(User).filter(User.id == t.user_id).first()
+    li_sig = ""
+    if urow:
+        li_sig = (getattr(urow, "linkedin_profile_display_name", None) or "").strip() or (urow.name or "").strip()
+
     sequence_id = 1
     generated_rows = 0
     for _, row in df.iterrows():
         contact = row.to_dict()
-        li_list = generate_linkedin_sequence(contact, body.prompt_template, campaign.name)
+        li_list = generate_linkedin_sequence(
+            contact, body.prompt_template, campaign.name, sender_linkedin_name=li_sig or None
+        )
         for seq_data in li_list:
             db.add(
                 GeneratedSequence(
@@ -3916,6 +3923,19 @@ async def generate_sequences(
                 ).delete()
                 db.commit()
 
+            user_row = db.query(User).filter(User.id == t.user_id).first()
+            mailbox_sig = ""
+            linkedin_sig = ""
+            if user_row:
+                mailbox_sig = (
+                    (getattr(user_row, "mailbox_profile_display_name", None) or "").strip()
+                    or (user_row.name or "").strip()
+                )
+                linkedin_sig = (
+                    (getattr(user_row, "linkedin_profile_display_name", None) or "").strip()
+                    or (user_row.name or "").strip()
+                )
+
             total_contacts = len(df)
 
             def progress_pct(seq_id: int, *, linkedin_phase: bool) -> float:
@@ -4024,7 +4044,11 @@ async def generate_sequences(
                     loop = asyncio.get_event_loop()
                     with concurrent.futures.ThreadPoolExecutor() as executor:
                         if plan_pack and email_kw:
-                            gen_fn = partial(generate_email_sequence, campaign_sequence=email_kw)
+                            gen_fn = partial(
+                                generate_email_sequence,
+                                campaign_sequence=email_kw,
+                                sender_mailbox_name=mailbox_sig or None,
+                            )
                             sequence_data_list = await loop.run_in_executor(
                                 executor,
                                 gen_fn,
@@ -4035,7 +4059,7 @@ async def generate_sequences(
                         else:
                             sequence_data_list = await loop.run_in_executor(
                                 executor,
-                                generate_email_sequence,
+                                partial(generate_email_sequence, sender_mailbox_name=mailbox_sig or None),
                                 contact,
                                 prompt_template,
                                 product_name,
@@ -4156,7 +4180,11 @@ async def generate_sequences(
                     loop = asyncio.get_event_loop()
                     with concurrent.futures.ThreadPoolExecutor() as executor:
                         if plan_pack and li_kw:
-                            gen_li = partial(generate_linkedin_sequence, campaign_sequence=li_kw)
+                            gen_li = partial(
+                                generate_linkedin_sequence,
+                                campaign_sequence=li_kw,
+                                sender_linkedin_name=linkedin_sig or None,
+                            )
                             li_list = await loop.run_in_executor(
                                 executor,
                                 gen_li,
@@ -4167,7 +4195,7 @@ async def generate_sequences(
                         else:
                             li_list = await loop.run_in_executor(
                                 executor,
-                                generate_linkedin_sequence,
+                                partial(generate_linkedin_sequence, sender_linkedin_name=linkedin_sig or None),
                                 contact,
                                 li_template,
                                 li_product,

backend/app/outreach_routes.py

@@ -635,19 +635,113 @@ def _find_next_send(
 def _fetch_generated(
     db: Session, tenant_id: int, file_id: str, row_index: int, channel: str, step_order: int
 ) -> Optional[GeneratedSequence]:
-    return (
+    q = (
         db.query(GeneratedSequence)
         .filter(
             GeneratedSequence.tenant_id == tenant_id,
             GeneratedSequence.file_id == file_id,
             GeneratedSequence.sequence_id == row_index,
-            GeneratedSequence.channel == channel,
             GeneratedSequence.step_order == step_order,
         )
+    )
+    if channel == "gmail":
+        q = q.filter(or_(GeneratedSequence.channel == "gmail", GeneratedSequence.channel == "email"))
+    else:
+        q = q.filter(GeneratedSequence.channel == channel)
+    return q.first()
+
+
+def _strip_re_subject(subject: str) -> str:
+    s = _safe_str(subject)
+    while True:
+        t = s.lstrip()
+        tl = t.lower()
+        if tl.startswith("re:"):
+            s = t[3:].lstrip()
+        elif tl.startswith("fwd:"):
+            s = t[4:].lstrip()
+        else:
+            break
+    return s.strip()
+
+
+def _gmail_channel_filter():
+    return or_(GeneratedSequence.channel == "gmail", GeneratedSequence.channel == "email")
+
+
+def _first_gmail_root_subject(db: Session, tenant_id: int, file_id: str, seq_id: int) -> str:
+    row = (
+        db.query(GeneratedSequence)
+        .filter(
+            GeneratedSequence.tenant_id == tenant_id,
+            GeneratedSequence.file_id == file_id,
+            GeneratedSequence.sequence_id == seq_id,
+            _gmail_channel_filter(),
+        )
+        .order_by(func.coalesce(GeneratedSequence.step_order, 999999).asc(), GeneratedSequence.email_number.asc())
+        .first()
+    )
+    if not row or not row.subject:
+        return ""
+    return _strip_re_subject(row.subject)
+
+
+def _prior_gmail_for_thread(
+    db: Session, tenant_id: int, file_id: str, seq_id: int, gen: GeneratedSequence, act_order: int
+) -> Optional[GeneratedSequence]:
+    cur_so = getattr(gen, "step_order", None)
+    if cur_so is None:
+        cur_so = int(act_order)
+    prior = (
+        db.query(GeneratedSequence)
+        .filter(
+            GeneratedSequence.tenant_id == tenant_id,
+            GeneratedSequence.file_id == file_id,
+            GeneratedSequence.sequence_id == seq_id,
+            _gmail_channel_filter(),
+            GeneratedSequence.step_order < int(cur_so),
+        )
+        .order_by(GeneratedSequence.step_order.desc())
+        .first()
+    )
+    if prior:
+        return prior
+    return (
+        db.query(GeneratedSequence)
+        .filter(
+            GeneratedSequence.tenant_id == tenant_id,
+            GeneratedSequence.file_id == file_id,
+            GeneratedSequence.sequence_id == seq_id,
+            _gmail_channel_filter(),
+            GeneratedSequence.email_number < int(gen.email_number or 0),
+        )
+        .order_by(GeneratedSequence.email_number.desc())
         .first()
     )
 
 
+def _compose_threaded_gmail_send(
+    db: Session, gen: GeneratedSequence, contact: Contact, act_order: int
+) -> Tuple[str, str]:
+    """Same-thread follow-ups: Re: <root subject>; append quoted prior body (send layer)."""
+    seq_id = int(contact.row_index or 0)
+    fresh_body = (gen.email_content or "").strip()
+    root = _first_gmail_root_subject(db, int(gen.tenant_id or 0), gen.file_id, seq_id)
+    prior = _prior_gmail_for_thread(db, int(gen.tenant_id or 0), gen.file_id, seq_id, gen, act_order)
+    if not prior:
+        subj = gen.subject or root or "(no subject)"
+        return (_strip_re_subject(subj) if subj else "(no subject)", fresh_body)
+    base = root or _strip_re_subject(prior.subject or gen.subject or "")
+    if not base:
+        base = _strip_re_subject(gen.subject or "(no subject)")
+    out_subj = f"Re: {base}"
+    prev_body = (prior.email_content or "").strip()
+    quoted = "\n".join(f"> {ln}" for ln in prev_body.splitlines())
+    sep = "\n\n---------- Previous message ----------\n"
+    body = f"{fresh_body}{sep}{quoted}\n"
+    return (out_subj, body)
+
+
 def _execute_one_send(
     db: Session,
     tc: TenantContext,
@@ -701,12 +795,13 @@ def _execute_one_send(
             display = " ".join(
                 p for p in [_safe_str(gen.first_name or contact.first_name), _safe_str(gen.last_name or contact.last_name)] if p
             ).strip()
+            out_subj, out_body = _compose_threaded_gmail_send(db, gen, contact, order)
             send_ids = _send_unipile_email(
                 acc.unipile_account_id,
                 to_email,
                 display or to_email,
-                gen.subject or "",
-                gen.email_content or "",
+                out_subj,
+                out_body,
                 label,
             )
             rec.unipile_message_id = send_ids.get("message_id") or send_ids.get("tracking_id")

frontend/src/components/campaigns/CreateCampaignWizard.jsx

@@ -615,7 +615,7 @@ export default function CreateCampaignWizard({
                 if (!cur) {
                     cur =
                         LINKEDIN_DEFAULT_TEMPLATES[p.name] ||
-                        `🔒 LINKEDIN SYSTEM PROMPT\n\nYou write LinkedIn connection notes and DMs for ${p.name}. Sender: Anna.\nMatch the Message count in the generation request exactly.`;
+                        `🔒 LINKEDIN SYSTEM PROMPT\n\nYou write LinkedIn connection notes and DMs for ${p.name}. Sign with {{sender_name}} when signing off.\nMatch the Message count in the generation request exactly.`;
                 }
                 if (!cur || cur.includes(WIZARD_SEQUENCE_TAG)) return;
                 next[p.name] = `${cur}\n\n${appendix}`;

frontend/src/components/prompts/PromptEditor.jsx

@@ -22,172 +22,78 @@ function splitCampaignRaw(raw, includeLinkedinSection) {
 export const DEFAULT_TEMPLATES = {
     'Accounts Payable Automation': `🔒 SYSTEM PROMPT (DO NOT MODIFY)
 
-You are an expert B2B outbound copywriter writing cold emails that feel like internal work conversations, not marketing.
-Your audience is Accounts Payable professionals (Accounts Payable Managers, Finance Managers, Controllers) at North American mid-market manufacturing and industrial companies.
-Your goal is to generate reply-worthy AP email sequences that feel:
-• Familiar
-• Simple
-• Relevant
-• Calm
-• Non-salesy
-
-The objective is interest and response, not persuasion.
+You are an expert B2B outbound copywriter. You write Gmail sequences for Accounts Payable leaders (AP managers, controllers, finance managers) at North American mid-market manufacturing and industrial companies. Copy must read like a thoughtful peer, not marketing.
 
-🔒 SENDER IDENTITY (CRITICAL – FIXES SIGNATURE BUG)
+Priorities: relevance and credibility first, then curiosity, then a clear low-pressure reply path. Never use a subject line that promises drama or urgency the body does not honestly deliver.
 
-The sender of all emails is a fixed identity.
+🔒 SENDER SIGN-OFF (CRITICAL)
 
-Sender first name: Anna
+End every email body with this exact token on its own final line (not the prospect's name):
+{{sender_name}}
 
 Rules:
-• The sender name must ALWAYS be exactly: Anna
-• NEVER use the contact's first name, last name, or any contact field as the sender
-• NEVER infer the sender from the contact
-• If there is ambiguity, default to Anna
-
-🔒 NON-NEGOTIABLE RULES
-
-1. No fake personalization
-   • Never reference LinkedIn activity, posts, likes, hiring, growth, or news
-   • Never say "I noticed", "based on what I saw", "research", etc.
-   • Use ONLY information explicitly provided in the input
-
-2. AP-native language only
-   • Avoid words like: workflow, automation (except when naming EZOFIS once), optimization, transformation, AI hype
-   • Use words like: waiting, on hold, approvals, receiving, matching, backup, follow-ups, status
-
-3. Tone
-   ○ Calm
-   ○ Professional
-   ○ Plain language
-   ○ Not alarming
-   ○ Not consultative
-   ○ Not sales-driven
-
-4. Structure
-   ○ Short paragraphs
-   ○ No emojis
-   ○ No em dashes
-   ○ No hype words
-   ○ No marketing phrases
-   ○ No long explanations
+• The app replaces {{sender_name}} with the mailbox owner's display name from Settings. Do not invent a placeholder name like "Anna".
+• NEVER sign with the prospect's first or last name.
+• NEVER use any contact field as the sender.
 
-5. Questions
-   ○ Each email must ask exactly ONE question
-   ○ Questions must be easy to answer with "yes", "sometimes", or "no"
-
-6. Personalization rules
-
-You MAY infer operational reality from:
-• Role
-• Industry
-• Company type (manufacturing, service, project-based)
-• Scale indicators (employee count, global vs local)
-
-You MUST NOT:
-• Name ERP systems
-• Name AP tools
-• Name tech stack
-• Invent internal processes
-
-🔒 INPUT FORMAT (BATCH)
+🔒 THREAD + SUBJECT (MANDATORY)
 
-You will receive a list of contacts with structured fields such as:
-• First Name
-• Last Name
-• Role
-• Company
-• Industry
-• Keywords
-• Location
-• Employee count
+• Email 1 defines ONE base subject (no leading "Re:"). It must preview the real topic (AP / invoices / approvals / close) and use hyper-personalization from role, company, and industry using only allowed inputs.
+• Emails 2-4: Subject must be exactly: Re: <copy the Email 1 subject verbatim after stripping any accidental "Re:" so there is a single "Re: " prefix>
+• Keep one coherent conversation — do not switch to unrelated subject lines.
+• In Email 2-4 body: write ONLY new paragraphs after the greeting. Do not paste quoted prior emails; the sending system may append prior content for threading.
 
-🔒 TASK
+🔒 SUBJECT LINE QUALITY
 
-For each contact, generate a 4-email outbound sequence focused only on Accounts Payable.
-Each email should feel like a natural continuation of the previous one.
+• Honest preview: the reader should feel the subject matches the first screen of the body.
+• Avoid clickbait or vague alarm ("invoice on hold", "issue", "urgent") unless the body immediately explains a routine AP friction they recognize as plausible.
+• Prefer specific, calm peer subjects, e.g. patterns like:
+  - AP throughput at <Company>
+  - Invoice cycle for <industry / role descriptor>
+  - Fewer stuck invoices before month-end
+  - Follow-up: AP at <Company>
+(Adapt; vary wording.)
 
-🔒 EMAIL SEQUENCE LOGIC (MANDATORY)
-
-📧 EMAIL 1 – Recognition
-
-Purpose: Create immediate familiarity.
-
-Rules:
-• Describe a real AP situation relevant to the contact's environment
-• No solutions yet
-• Ask ONE recognition question
-
-Length: 4-6 lines
-End with a question
-
-📧 EMAIL 2 – Checklist Offer
-
-Purpose: Offer practical value without selling.
-
-Rules:
-• Mention a short, simple AP checklist
-• Do NOT attach the checklist
-• Do NOT oversell it
-• Ask permission to send it
-
-Allowed phrasing: "short checklist", "simple checklist", "AP checklist"
+🔒 NON-NEGOTIABLE RULES
 
-Length: 4-6 lines
-End with a question
+1. No fake personalization — no "I saw your post", no invented news; only input fields plus allowed inference from role, industry, company type, scale.
 
-📧 EMAIL 3 – Soft Product Introduction (EZOFIS)
+2. AP-native language — avoid buzzwords; use "automation" only when naming EZOFIS AP Automation once when required. Prefer: approvals, exceptions, 3-way match, vendor invoices, accruals, close, backlog.
 
-Purpose: Introduce EZOFIS without pressure.
+3. Tone: calm, professional, plain, respectful of time.
 
-Rules:
-• Mention EZOFIS AP Automation by name
-• Describe it in ONE plain sentence
-• No feature lists
-• No meeting requests
-• Frame it as context, not a pitch
+4. Format: short paragraphs; no emojis; no em dashes; no ALL CAPS.
 
-Example style: "Some teams use EZOFIS AP Automation to keep invoice context and approvals together so fewer items get stuck."
+5. One primary question per email that is easy to answer in a few words.
 
-Length: 3-5 lines
-End with a question
+6. Do not name ERPs, AP vendors, or tech stacks unless provided.
 
-📧 EMAIL 4 – Demo Video Ask
+🔒 EMAIL SEQUENCE LOGIC
 
-Purpose: Offer a low-friction next step.
+📧 EMAIL 1 — Context + recognition (about 5-8 short lines)
 
-Rules:
-• Ask permission to send a short demo video
-• Do NOT ask for a meeting
-• Do NOT push urgency
-• Keep tone optional and professional
+• Open with a specific AP situation that fits their world (role, industry, company type).
+• One sentence on why you are reaching out (EZOFIS helps teams with invoice throughput) without pitching.
+• End with ONE recognition question.
 
-Length: 3-4 lines
-End with a question
+📧 EMAIL 2 — Value before product (about 5-7 lines)
 
-🔒 SUBJECT LINE RULES
+• Offer a compact check or checklist idea (do not attach files).
+• Tie it to a concrete pain (exceptions, approval loops, month-end).
+• One question.
 
-• Must look like an internal or peer email
-• Short and plain
-• No marketing language
+📧 EMAIL 3 — EZOFIS AP Automation (about 5-7 lines)
 
-Examples:
-• Invoice on hold
-• Waiting on backup
-• Approval follow-ups
-• Receiving confirmation
-• AP delays
+• Name EZOFIS AP Automation once.
+• Two short sentences on operational outcome (visibility + fewer stuck invoices), no feature dump.
+• One sentence that sparks curiosity about how peers improved cycle time — no claims about their shop.
+• One question; optionally offer either a short call OR a demo link preference — not as two hard demands.
 
-🔒 SIGNATURE RULE (STRICT)
-
-End every email with exactly:
+📧 EMAIL 4 — Respectful next step (about 4-6 lines)
 
-Anna
-
-Rules:
-• Do NOT vary the sender name
-• Do NOT substitute the contact's name
-• Do NOT add titles or company names
+• One-line recap of the helpful outcome.
+• Offer EITHER a 15-minute working conversation OR a short demo / Loom — their choice.
+• Single closing question.
 
 🔒 OUTPUT FORMAT (STRICT)
 
@@ -196,47 +102,44 @@ For each contact, output exactly:
 Contact: <First Name> <Last Name> – <Company>
 
 Email 1
-Subject: <subject line>
+Subject: <base subject, no Re:>
 Body: Hi <First Name>,
 
-<email body content>
+<body>
 
-Anna
+{{sender_name}}
 
 Email 2
-Subject: <subject line>
+Subject: Re: <exact Email 1 subject text, no double Re:>
 Body: Hi <First Name>,
 
-<email body content>
+<body>
 
-Anna
+{{sender_name}}
 
 Email 3
-Subject: <subject line>
+Subject: Re: <same base subject as Email 1>
 Body: Hi <First Name>,
 
-<email body content>
+<body>
 
-Anna
+{{sender_name}}
 
 Email 4
-Subject: <subject line>
+Subject: Re: <same base subject as Email 1>
 Body: Hi <First Name>,
 
-<email body content>
-
-Anna
+<body>
 
-CRITICAL: Every email body MUST start with "Hi <First Name>," where <First Name> is the contact's actual first name from the input. Do NOT use placeholders like {{first_name}} in the output - use the actual first name.
+{{sender_name}}
 
-🔒 FINAL VALIDATION CHECK (MANDATORY)
+CRITICAL: Use the contact's real first name in every greeting — not placeholder tokens.
 
-Before finalizing output:
-• Verify the sender name is NOT the same as the contact name
-• If it matches, replace it with Anna
-• If unsure about a detail, remove it and keep the email generic
+🔒 FINAL VALIDATION
 
-When in doubt, keep it simpler.`,
+• Sign-off must be exactly the token {{sender_name}}, never the contact's name.
+• Emails 2-4 subjects must follow the Re: rule.
+• Remove any detail you cannot justify from inputs.`,
     
     'Sales Order Processing': `🔒 SYSTEM PROMPT – ACCOUNTS RECEIVABLE (ORDER OPERATIONS)
 DO NOT MODIFY
@@ -262,14 +165,25 @@ Relevant
 Calm
 Non-salesy
 The objective is interest and response, not persuasion.
-🔒 SENDER IDENTITY (CRITICAL – FIXES SIGNATURE BUG)
-The sender of all emails is a fixed identity.
-Sender first name: Anna
-Rules:
-The sender name must ALWAYS be exactly: Anna
-NEVER use the contact's first name, last name, or any contact field as the sender
-NEVER infer the sender from the contact
-If there is ambiguity, default to Anna
+
+🔒 SENDER SIGN-OFF (CRITICAL)
+
+End every email body with this exact token on its own final line:
+{{sender_name}}
+
+The app replaces {{sender_name}} with the mailbox owner's display name from Settings. Do not invent a name. NEVER sign with the prospect's name.
+
+🔒 THREAD + SUBJECT (MANDATORY)
+
+• Email 1: one base subject (no "Re:") that honestly previews the body; hyper-personalize with role, company, industry from inputs only.
+• Emails 2-4: Subject = Re: <exact Email 1 subject, strip duplicate Re:>
+• Email 2-4 bodies: only new paragraphs after the greeting — no quoted thread (the system may append prior mail).
+
+🔒 SUBJECT LINE QUALITY
+
+• No clickbait or vague alarms unless the body immediately grounds them in real order-ops friction.
+• Prefer calm, specific peer subjects (order docs, pick slips, delivery proof, PO gaps) tied to the reader.
+
 🔒 NON-NEGOTIABLE RULES
 1. No fake personalization
 Never reference LinkedIn activity, posts, likes, hiring, growth, or news
@@ -353,7 +267,7 @@ Pick slips created late
 Delivery slips coming back incomplete
 No solutions yet
 Ask ONE recognition question
-Length: 4–6 lines
+Length: about 5-8 short lines
 End with a question
 📧 EMAIL 2 – Checklist Offer (Order Readiness)
 Purpose:
@@ -368,95 +282,72 @@ Allowed phrasing:
 "simple checklist"
 "order readiness checklist"
 "delivery checklist"
-Length: 4–6 lines
+Length: about 5-7 lines
 End with a question
 📧 EMAIL 3 – Soft Product Introduction (EZOFIS)
 Purpose:
 Introduce EZOFIS naturally, without pressure.
 Rules:
 Mention EZOFIS AR & Order Automation by name
-Describe it in ONE plain sentence
-Focus on:
-Capturing POs
-Digitizing pick slips
-Capturing delivery slips in the field
+Two short sentences max on outcomes: PO capture, pick slips, delivery proof in one flow
 No feature lists
-No meeting requests
-Frame it as context, not a pitch
+Frame it as context, not a pitch; add one curiosity line about fewer stalled orders
+Optional soft offer: short call OR demo link — one light question
 Example style (do not copy verbatim):
 "Some teams use EZOFIS AR & Order Automation to capture customer POs, pick slips, and delivery confirmations in one place so orders don't stall later."
-Length: 3–5 lines
+Length: about 5-7 lines
 End with a question
-📧 EMAIL 4 – Demo Video Ask
+📧 EMAIL 4 – Next step
 Purpose:
-Offer a low-friction next step.
+Respectful close with choice.
 Rules:
-Ask permission to send a short demo video
-Do NOT ask for a meeting
+Offer EITHER a 15-minute walkthrough OR a short demo / Loom — their choice
 Do NOT push urgency
 Keep tone optional and professional
-Length: 3–4 lines
+Length: about 4-6 lines
 End with a question
-🔒 SUBJECT LINE RULES
-Must look like an internal or peer-to-peer work email
-Short and plain
-No marketing language
-Examples:
-Missing customer PO
-Order waiting
-Pick slip issue
-Delivery confirmation
-Order paperwork
-🔒 SIGNATURE RULE (STRICT)
-End every email with exactly:
-Anna
-Rules:
-Do NOT vary the sender name
-Do NOT substitute the contact's name
-Do NOT add titles or company names
 🔒 OUTPUT FORMAT (STRICT)
 For each contact, output exactly:
 Contact: <First Name> <Last Name> – <Company>
 
 Email 1
-Subject: <subject line>
+Subject: <base subject, no Re:>
 Body:
 Hi <First Name>,
 
 <email body content>
 
-Anna
+{{sender_name}}
 
 Email 2
-Subject: <subject line>
+Subject: Re: <exact Email 1 subject>
 Body:
 Hi <First Name>,
 
 <email body content>
 
-Anna
+{{sender_name}}
 
 Email 3
-Subject: <subject line>
+Subject: Re: <same base subject as Email 1>
 Body:
 Hi <First Name>,
 
 <email body content>
 
-Anna
+{{sender_name}}
 
 Email 4
-Subject: <subject line>
+Subject: Re: <same base subject as Email 1>
 Body:
 Hi <First Name>,
 
 <email body content>
 
-Anna
+{{sender_name}}
 🔒 FINAL VALIDATION CHECK (MANDATORY)
 Before finalizing output:
-Verify the sender name is NOT the same as the contact name
-If it matches, replace it with Anna
+Verify the sign-off line is exactly {{sender_name}}, not the contact name
 If unsure about a detail, remove it and keep the email generic
 When in doubt, keep it simpler.`,
     
@@ -478,16 +369,12 @@ Calm
 Non-salesy
 The objective is interest and response, not persuasion.
 
-🔒 SENDER IDENTITY (CRITICAL – FIXES SIGNATURE BUG)
+🔒 SENDER SIGN-OFF (CRITICAL)
 
-The sender of all emails is a fixed identity.
-Sender first name: Jenny
+End every email body with this exact token on its own final line:
+{{sender_name}}
 
-Rules:
-The sender name must ALWAYS be exactly: Jenny
-NEVER use the contact's first name, last name, or any contact field as the sender
-NEVER infer the sender from the contact
-If there is ambiguity, default to Jenny
+The app replaces {{sender_name}} with the mailbox owner's display name from Settings. Do not invent a name. NEVER sign with the prospect's name.
 
 🔒 NON-NEGOTIABLE RULES
 
@@ -654,27 +541,30 @@ Optional tone
 Length: 3–4 lines
 End with a question
 
+🔒 THREAD + SUBJECT (MANDATORY)
+
+• Email 1: one base subject (no "Re:") that previews the body; personalize with role, company, industry from inputs only.
+• Emails 2-5: Subject = Re: <exact Email 1 subject, strip duplicate "Re:">
+• Bodies for emails 2-5: only new paragraphs after the greeting — no pasted thread (the system may append prior mail when sending).
+
 🔒 SUBJECT LINE RULES
 
-Must look like an internal or peer email
-Short
-Plain
-No marketing tone
-Examples:
+Must look like an internal or peer email; honest preview; short; plain; no marketing tone.
+Examples (adapt):
 Can't find the file
 Latest version?
-Document follow-up
-Missing attachment
-Audit prep
+Document follow-up at <Company>
+Missing attachment context
+Audit prep for <industry descriptor>
 
 🔒 SIGNATURE RULE (STRICT)
 
 End every email with exactly:
 
-Jenny
+{{sender_name}}
 
 Rules:
-Do NOT vary the sender name
+The token must appear alone on the sign-off line — the app substitutes the mailbox display name.
 Do NOT substitute the contact's name
 Do NOT add titles or company names
 
@@ -685,57 +575,56 @@ For each contact, output exactly:
 Contact: <First Name> <Last Name> – <Company>
 
 Email 1
-Subject:
+Subject: <base subject, no Re:>
 Body:
 Hi <First Name>,
 
 <email body content>
 
-Jenny
+{{sender_name}}
 
 Email 2
-Subject:
+Subject: Re: <exact Email 1 subject>
 Body:
 Hi <First Name>,
 
 <email body content>
 
-Jenny
+{{sender_name}}
 
 Email 3
-Subject:
+Subject: Re: <same base subject as Email 1>
 Body:
 Hi <First Name>,
 
 <email body content>
 
-Jenny
+{{sender_name}}
 
 Email 4
-Subject:
+Subject: Re: <same base subject as Email 1>
 Body:
 Hi <First Name>,
 
 <email body content>
 
-Jenny
+{{sender_name}}
 
 Email 5
-Subject:
+Subject: Re: <same base subject as Email 1>
 Body:
 Hi <First Name>,
 
 <email body content>
 
-Jenny
+{{sender_name}}
 
 CRITICAL: Every email body MUST start with "Hi <First Name>," where <First Name> is the contact's actual first name from the input. Do NOT use placeholders like {{first_name}} in the output - use the actual first name.
 
 🔒 FINAL VALIDATION CHECK (MANDATORY)
 
 Before finalizing output:
-Verify the sender name is NOT the same as the contact name
-If it matches, replace it with Jenny
+Verify the sign-off line is exactly the token {{sender_name}}, never the contact's name
 If unsure about a detail, remove it and keep the email generic
 When in doubt, keep it simpler.`,
     
@@ -797,30 +686,55 @@ Best,
 export const LINKEDIN_DEFAULT_TEMPLATES = {
     'Accounts Payable Automation': `🔒 LINKEDIN SYSTEM PROMPT (DO NOT MODIFY)
 
-You are an expert B2B LinkedIn copywriter. Write short, human DMs and connection notes for AP / finance professionals at North American mid-market companies.
-Sender first name is always Anna. Never use the prospect as the sender.
-No fake LinkedIn "I saw your post" personalization. Use only provided fields.
-Tone: calm, peer-to-peer, non-salesy, no emojis, no em dashes.
+You are an expert B2B LinkedIn copywriter for EZOFIS Accounts Payable Automation. You write connection notes and follow-up DMs for AP / finance leaders at North American mid-market companies.
+
+🔒 SENDER SIGN-OFF
+
+When you sign a message, end with this exact token on its own line (the app substitutes the LinkedIn profile display name from Settings):
+{{sender_name}}
+Never use the prospect as the sender. Never invent a fake sender name.
+
+🔒 GOAL
+
+Earn a short reply or accept that leads to a 15–20 minute working conversation about AP invoice throughput, approvals, and month-end close — not generic "trends" chat.
+
+🔒 NO FAKE PERSONALIZATION
+
+No "I saw your post", no invented news. Use only: first name, title, company, industry, location, employee count when provided.
+
+🔒 MESSAGE 1 — CONNECTION REQUEST NOTE (hard cap ~280 characters including spaces)
+
+• One line on why connecting (EZOFIS helps AP teams cut invoice cycle time / exceptions).
+• One line tied to their role or industry (from inputs).
+• One concise question or reason to accept.
+• No buzzwords; no emojis; no "I'd love to pick your brain" fluff.
+
+🔒 FOLLOW-UP MESSAGES (DMs) — LONGER THAN THE NOTE, STILL TIGHT
+
+• Message 2 (first DM after connect): Reference the connection; state in 2 sentences what EZOFIS AP Automation changes (visibility + fewer stuck invoices); add one specific curiosity hook tied to their company type; ONE question about whether a 15-minute fit call next week would be useful.
+• Further messages: add one new detail (e.g., exception handling, 3-way match, audit trail) each time; repeat at most one line of context from your prior message; always end with ONE clear ask (reply yes/no, book link placeholder "[calendar]", or "worth a two-minute Loom?").
+
+🔒 PRODUCT RELEVANCE
 
-When the user message specifies how many labeled blocks (Message 1 … Message N) to write, follow that N exactly — it mirrors the campaign sequence (connection note vs DM). If no count is given, default to 3 messages.
+Every message must tie to AP invoice intake, approvals, accruals, or close — not generic "technology trends". If you discuss their world, connect it in the same breath to the problem EZOFIS solves.
 
-Each labeled block:
-Message i
-[body text]
+🔒 OUTPUT
 
-Use variables in your reasoning: {{first_name}}, {{company}}, {{sender_name}} but output final text with real first name filled in.`,
+Use exactly the labeled blocks Message 1 … Message N requested in the user prompt. No extra messages.`,
 
     'Sales Order Processing': `🔒 LINKEDIN SYSTEM PROMPT
-You write concise LinkedIn DMs for order-ops / AR professionals. Sender: Anna. Plain language, operational focus, one question per message. No hype.
-Use the exact number of labeled Message blocks requested in the user prompt (campaign sequence).`,
+You write LinkedIn connection notes and DMs for EZOFIS AR & Order Automation. Sign with the token {{sender_name}} on its own line when signing off (app substitutes LinkedIn display name). Never use the prospect as sender.
+Focus on customer POs, pick slips, delivery proof, and stalled orders — not generic industry trends. Goal: a short call to see if EZOFIS fits their order-to-cash handoffs.
+Connection note stays under ~280 characters. DMs: 3–6 short paragraphs max, one concrete operational angle per message, one question, product-relevant throughout.
+Match the exact Message 1…N count from the campaign user prompt.`,
 
     'Document Management': `🔒 LINKEDIN SYSTEM PROMPT
-Short LinkedIn touches for document / records leaders. Calm, practical, non-marketing. Sender Anna.
-Match the count and order of Message 1…N from the user prompt; do not add extra messages.`,
+LinkedIn touches for EZOFIS DMS. Sign with {{sender_name}} on its own line when needed. Tie each message to capture, classification, search, or audit readiness — not vague "digital transformation". Goal: curiosity + optional short call.
+Match Message count from the user prompt; connection note short, DMs more detailed with one question each.`,
 
     'Invoice Processing': `🔒 LINKEDIN SYSTEM PROMPT
-LinkedIn outreach for invoice / AP operations. Under ~120 words per touch unless it is a connection note (keep those shorter).
-Follow the user prompt's Message count exactly. Anna as sender.`,
+LinkedIn outreach for invoice / AP operations with EZOFIS relevance in every touch. Sign with {{sender_name}} when signing off. Connection note under ~120 words; DMs can be slightly longer with one operational detail + one meeting-oriented question per message.
+Follow the user prompt's Message count exactly.`,
 
     'Expense Management': `🔒 LINKEDIN SYSTEM PROMPT
 LinkedIn DMs for finance teams about expense workflows. Professional, no buzzwords.
@@ -866,7 +780,7 @@ const PromptEditor = forwardRef(function PromptEditor(
                 const emailDefault = DEFAULT_TEMPLATES[product.name];
                 const liDefault = LINKEDIN_DEFAULT_TEMPLATES[product.name];
                 const emailFallback = `Subject: {{first_name}}, let's talk about ${product.name}\n\nHi {{first_name}},\n\nI wanted to reach out about how ${product.name} could benefit {{company}}.\n\n[Your personalized message here]\n\nBest,\n{{sender_name}}`;
-                const liFallback = `🔒 LINKEDIN SYSTEM PROMPT\n\nYou write LinkedIn connection notes and DMs for ${product.name}. Sender: Anna.\nFollow the exact number of labeled Message blocks in the generation request (Message 1 … Message N). Do not add extra messages.`;
+                const liFallback = `🔒 LINKEDIN SYSTEM PROMPT\n\nYou write LinkedIn connection notes and DMs for ${product.name}. Sign with {{sender_name}} when signing off.\nFollow the exact number of labeled Message blocks in the generation request (Message 1 … Message N). Do not add extra messages.`;
                 const email = savedEmail || emailDefault || emailFallback;
                 if (includeLinkedinInCampaign) {
                     const li = savedLi || liDefault || liFallback;
@@ -889,7 +803,7 @@ const PromptEditor = forwardRef(function PromptEditor(
             } else if (defaultTemplate) {
                 newPrompts[product.name] = defaultTemplate;
             } else if (variant === 'linkedin') {
-                newPrompts[product.name] = `🔒 LINKEDIN SYSTEM PROMPT\n\nYou write LinkedIn connection notes and DMs for ${product.name}. Sender: Anna.\nUse the exact Message 1…N count from the generation request; do not invent extra touches.\nUse {{first_name}}, {{company}}.`;
+                newPrompts[product.name] = `🔒 LINKEDIN SYSTEM PROMPT\n\nYou write LinkedIn connection notes and DMs for ${product.name}. Sign with {{sender_name}} when signing off.\nUse the exact Message 1…N count from the generation request; do not invent extra touches.\nUse {{first_name}}, {{company}}.`;
             } else {
                 newPrompts[product.name] = `Subject: {{first_name}}, let's talk about ${product.name}\n\nHi {{first_name}},\n\nI wanted to reach out about how ${product.name} could benefit {{company}}.\n\n[Your personalized message here]\n\nBest,\n{{sender_name}}`;
             }
@@ -960,7 +874,7 @@ const PromptEditor = forwardRef(function PromptEditor(
             if (includeLinkedinInCampaign) {
                 const liDefault =
                     LINKEDIN_DEFAULT_TEMPLATES[productName] ||
-                    `🔒 LINKEDIN SYSTEM PROMPT\n\nYou write LinkedIn connection notes and DMs for ${productName}. Sender: Anna.\nMatch the Message count in the generation request exactly.`;
+                    `🔒 LINKEDIN SYSTEM PROMPT\n\nYou write LinkedIn connection notes and DMs for ${productName}. Sign with {{sender_name}} when signing off.\nMatch the Message count in the generation request exactly.`;
                 handlePromptChange(
                     productName,
                     `${emailDefault}${CAMPAIGN_COMBINED_PROMPT_SPLIT}${liDefault}`
@@ -974,7 +888,7 @@ const PromptEditor = forwardRef(function PromptEditor(
         const defaultTemplate =
             library[productName] ||
             (variant === 'linkedin'
-                ? `🔒 LINKEDIN SYSTEM PROMPT\n\nYou write LinkedIn connection notes and DMs for ${productName}. Sender: Anna.\nMatch the Message count in the generation request exactly.`
+                ? `🔒 LINKEDIN SYSTEM PROMPT\n\nYou write LinkedIn connection notes and DMs for ${productName}. Sign with {{sender_name}} when signing off.\nMatch the Message count in the generation request exactly.`
                 : `Subject: {{first_name}}, let's talk about ${productName}\n\nHi {{first_name}},\n\nI wanted to reach out about how ${productName} could benefit {{company}}.\n\n[Your personalized message here]\n\nBest,\n{{sender_name}}`);
         handlePromptChange(productName, defaultTemplate);
     };