diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index da6399f..252dbd0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -106,8 +106,8 @@ jobs:
             fi
           }
 
-          report_blocking "Lint (web + convex)" "${{ steps.lint.outcome }}"
-          report_blocking "Typecheck (web + convex)" "${{ steps.typecheck.outcome }}"
+          report_blocking "Lint" "${{ steps.lint.outcome }}"
+          report_blocking "Typecheck" "${{ steps.typecheck.outcome }}"
           report_blocking "Convex raw auth guard" "${{ steps.convex_auth_guard.outcome }}"
           report_warning "Convex validator any guard" "${{ steps.convex_any_guard.outcome }}"
           report_blocking "Secret scan gate" "${{ steps.secret_scan.outcome }}"
diff --git a/apps/widget/src/components/ConversationView.tsx b/apps/widget/src/components/ConversationView.tsx
index 798f916..3d96fa2 100644
--- a/apps/widget/src/components/ConversationView.tsx
+++ b/apps/widget/src/components/ConversationView.tsx
@@ -40,7 +40,7 @@ export function ConversationView({
     return sessionStorage.getItem("opencom_email_dismissed") === "true";
   });
   const [emailCapturedThisSession, setEmailCapturedThisSession] = useState(false);
-  const [hasVisitorSentMessage, setHasVisitorSentMessage] = useState(false);
+  // const [hasVisitorSentMessage, setHasVisitorSentMessage] = useState(false);
   const [lastAgentMessageCount, setLastAgentMessageCount] = useState(0);
   const [emailInput, setEmailInput] = useState("");
   const [showArticleSuggestions, setShowArticleSuggestions] = useState(false);
@@ -157,7 +157,7 @@ export function ConversationView({
       setShowEmailCapture(false);
       return;
     }
-    if (!hasVisitorSentMessage) return;
+    // if (!hasVisitorSentMessage) return;
     if (!automationSettings?.collectEmailEnabled) return;
 
     const agentCount = agentMessageCount;
@@ -175,7 +175,7 @@ export function ConversationView({
   }, [
     visitorId,
     isVisitorAlreadyIdentified,
-    hasVisitorSentMessage,
+    // hasVisitorSentMessage,
     agentMessageCount,
     emailCapturedOrDismissed,
     lastAgentMessageCount,
@@ -205,9 +205,9 @@ export function ConversationView({
         visitorId,
         sessionToken: sessionTokenRef.current ?? undefined,
       });
-      if (!hasVisitorSentMessage) {
-        setHasVisitorSentMessage(true);
-      }
+      // if (!hasVisitorSentMessage) {
+      //   setHasVisitorSentMessage(true);
+      // }
 
       if (aiSettings?.enabled !== false) {
         setIsAiTyping(true);
diff --git a/apps/widget/src/components/conversationView/Footer.tsx b/apps/widget/src/components/conversationView/Footer.tsx
index 6b2808a..de4816d 100644
--- a/apps/widget/src/components/conversationView/Footer.tsx
+++ b/apps/widget/src/components/conversationView/Footer.tsx
@@ -50,7 +50,7 @@ export function ConversationFooter({
   emailInput,
   onEmailInputChange,
   onEmailSubmit,
-  onEmailDismiss,
+  // onEmailDismiss,
   officeHoursStatus,
   expectedReplyTime,
   commonIssueButtons,
@@ -127,9 +127,9 @@ export function ConversationFooter({
                   Save
                 </button>
               </div>
-              <button onClick={onEmailDismiss} className="opencom-email-skip" type="button">
+              {/* <button onClick={onEmailDismiss} className="opencom-email-skip" type="button">
                 Skip
-              </button>
+              </button> */}
             </div>
           )}
 
diff --git a/apps/widget/src/styles.css b/apps/widget/src/styles.css
index 338ff9d..ca6881b 100644
--- a/apps/widget/src/styles.css
+++ b/apps/widget/src/styles.css
@@ -267,7 +267,7 @@
 .opencom-messages {
   flex: 1;
   overflow-y: auto;
-  padding: 16px;
+  padding: 16px 16px 0;
   display: flex;
   flex-direction: column;
   gap: 12px;
@@ -431,7 +431,6 @@
   background: var(--opencom-bg-surface);
   display: flex;
   flex-direction: column;
-  gap: 8px;
 }
 
 .opencom-conversation-status {
@@ -456,7 +455,7 @@
 }
 
 .opencom-input-container {
-  padding: 12px 16px 16px;
+  padding: 10px;
   display: flex;
   gap: 8px;
   background: var(--opencom-bg-surface);
@@ -1018,7 +1017,7 @@
 }
 
 .opencom-email-capture {
-  padding: 12px 16px;
+  padding: 8px 10px;
   background: linear-gradient(135deg, #faf5ff 0%, #ede9fe 100%);
   border-top: 1px solid #c4b5fd;
   animation: slideInUp 0.3s ease-out;
@@ -1881,9 +1880,9 @@
     max-width: 85%;
   }
 
-  .opencom-email-capture {
+  /* .opencom-email-capture {
     padding: 14px 16px;
-  }
+  } */
 
   .opencom-email-input {
     padding: 10px 14px;
diff --git a/packages/react-native-sdk/src/components/messenger/ConversationDetailView.tsx b/packages/react-native-sdk/src/components/messenger/ConversationDetailView.tsx
index 708c25c..f07e42b 100644
--- a/packages/react-native-sdk/src/components/messenger/ConversationDetailView.tsx
+++ b/packages/react-native-sdk/src/components/messenger/ConversationDetailView.tsx
@@ -46,7 +46,7 @@ export function ConversationDetailView({
   onEmailChange,
   showEmailCapture,
   onEmailSubmit,
-  onEmailDismiss,
+  // onEmailDismiss,
   isValidEmail,
   flatListRef,
 }: ConversationDetailViewProps) {
@@ -139,9 +139,9 @@ export function ConversationDetailView({
               </Text>
             </TouchableOpacity>
           </View>
-          <TouchableOpacity onPress={onEmailDismiss} style={messengerStyles.emailSkipButton}>
+          {/* <TouchableOpacity onPress={onEmailDismiss} style={messengerStyles.emailSkipButton}>
             <Text style={[messengerStyles.emailSkipText, { color: theme.textMuted }]}>Skip</Text>
-          </TouchableOpacity>
+          </TouchableOpacity> */}
         </View>
       )}
 
diff --git a/packages/react-native-sdk/src/components/messenger/messengerFlow.ts b/packages/react-native-sdk/src/components/messenger/messengerFlow.ts
index acf91c0..802c212 100644
--- a/packages/react-native-sdk/src/components/messenger/messengerFlow.ts
+++ b/packages/react-native-sdk/src/components/messenger/messengerFlow.ts
@@ -77,7 +77,10 @@ export function evaluateEmailCaptureDecision(
   if (!input.visitorId || input.emailCaptured) {
     return null;
   }
-  if (!input.hasVisitorSentMessage || !input.collectEmailEnabled) {
+  if (
+    // !input.hasVisitorSentMessage ||
+    !input.collectEmailEnabled
+  ) {
     return null;
   }