diff --git a/JobTrackerApi/Controllers/GmailController.cs b/JobTrackerApi/Controllers/GmailController.cs
index 57ac4f9..980887e 100644
--- a/JobTrackerApi/Controllers/GmailController.cs
+++ b/JobTrackerApi/Controllers/GmailController.cs
@@ -3,6 +3,7 @@ using System.Text.Json;
 using JobTrackerApi.Data;
 using JobTrackerApi.Models;
 using JobTrackerApi.Services;
+using JobTrackerApi.Services.EmailProviders;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
@@ -18,15 +19,24 @@ public sealed class GmailController : ControllerBase
     private readonly IGmailJobMatchingService _matching;
     private readonly JobTrackerContext _db;
     private readonly IConfiguration _cfg;
+    private readonly IEmailProviderRegistry _providers;
 
-    public GmailController(IGmailOAuthService gmail, IGmailJobMatchingService matching, JobTrackerContext db, IConfiguration cfg)
+    public GmailController(IGmailOAuthService gmail, IGmailJobMatchingService matching, JobTrackerContext db, IConfiguration cfg, IEmailProviderRegistry? providers = null)
     {
         _gmail = gmail;
         _matching = matching;
         _db = db;
         _cfg = cfg;
+        // Fall back to a single-Gmail registry so direct construction (tests) keeps working.
+        _providers = providers ?? new EmailProviderRegistry(new IEmailProvider[] { new GmailProvider(gmail) });
     }
 
+    // The email provider backing this controller's read paths (search + thread listing),
+    // via the provider-neutral seam. OAuth and Gmail-specific candidate ranking still use
+    // IGmailOAuthService directly until they are generalised.
+    private IEmailProvider Email => _providers.Get("gmail")
+        ?? throw new InvalidOperationException("Gmail email provider is not registered.");
+
     public sealed record GmailImportResultDto(int Imported, int Skipped, string? ThreadId);
     public sealed record GmailImportMessageResultDto(int Imported, int Skipped, string MessageId, string? ThreadId, Correspondence? Message);
     public sealed record ImportGmailMessageRequest(int JobApplicationId, string MessageId);
@@ -383,7 +393,7 @@ public sealed class GmailController : ControllerBase
                 .FirstOrDefaultAsync(x => x.Id == request.JobApplicationId.Value, cancellationToken);
             if (job is null) return NotFound("Job application not found.");
 
-            var threadMessages = await _gmail.ListThreadMessagesAsync(ownerUserId, request.ThreadId.Trim(), cancellationToken);
+            var threadMessages = await Email.ListThreadMessagesAsync(ownerUserId, request.ThreadId.Trim(), cancellationToken);
             var distinctMessageIds = threadMessages
                 .Where(message => !string.IsNullOrWhiteSpace(message.Id))
                 .Select(message => message.Id)
@@ -639,7 +649,7 @@ public sealed class GmailController : ControllerBase
         _db.JobApplications.Add(job);
         await _db.SaveChangesAsync(cancellationToken);
 
-        var threadMessages = await _gmail.ListThreadMessagesAsync(ownerUserId, request.ThreadId.Trim(), cancellationToken);
+        var threadMessages = await Email.ListThreadMessagesAsync(ownerUserId, request.ThreadId.Trim(), cancellationToken);
         var distinctMessageIds = threadMessages.Select(message => message.Id).Where(static id => !string.IsNullOrWhiteSpace(id)).Distinct(StringComparer.Ordinal).ToList();
         // Batch the "already imported?" check with a single query instead of one
         // AnyAsync per message (N+1), mirroring RelinkThread below.
@@ -695,7 +705,7 @@ public sealed class GmailController : ControllerBase
             }
         }
 
-        var threadMessages = await _gmail.ListThreadMessagesAsync(ownerUserId, threadId, cancellationToken);
+        var threadMessages = await Email.ListThreadMessagesAsync(ownerUserId, threadId, cancellationToken);
         var distinctMessageIds = threadMessages.Select(message => message.Id).Where(static id => !string.IsNullOrWhiteSpace(id)).Distinct(StringComparer.Ordinal).ToList();
         var existingMessageIds = await _db.Correspondences
             .Where(message => message.JobApplicationId == job.Id && message.ExternalMessageId != null && distinctMessageIds.Contains(message.ExternalMessageId))
@@ -793,7 +803,7 @@ public sealed class GmailController : ControllerBase
     public async Task<IActionResult> Messages([FromQuery] string? query, [FromQuery] int maxResults = 12, CancellationToken cancellationToken = default)
     {
         var ownerUserId = GetRequiredOwnerUserId();
-        var items = await _gmail.ListMessagesAsync(ownerUserId, query, maxResults, cancellationToken);
+        var items = await Email.SearchAsync(ownerUserId, query, maxResults, cancellationToken);
         return Ok(items);
     }
 
@@ -897,7 +907,7 @@ public sealed class GmailController : ControllerBase
 
             foreach (var threadId in linkedThreadIds)
             {
-                var threadMessages = await _gmail.ListThreadMessagesAsync(ownerUserId, threadId, cancellationToken);
+                var threadMessages = await Email.ListThreadMessagesAsync(ownerUserId, threadId, cancellationToken);
                 var distinctThreadMessages = threadMessages
                     .Where(message => !string.IsNullOrWhiteSpace(message.Id))
                     .GroupBy(message => message.Id, StringComparer.Ordinal)