diff --git a/packages/export-handler/src/index.ts b/packages/export-handler/src/index.ts
index cac46cb92..1a3aafa27 100644
--- a/packages/export-handler/src/index.ts
+++ b/packages/export-handler/src/index.ts
@@ -37,11 +37,11 @@ const createSignedUrl = async (file: File): Promise<string> => {
 
 export const sendExportCompletedEmail = async (
   redisDataSource: RedisDataSource,
-  emailAddress: string,
+  userId: string,
   urlToDownload: string
 ) => {
   return queueEmailJob(redisDataSource, {
-    to: emailAddress,
+    userId,
     subject: 'Your Omnivore export is ready',
     html: `<p>Your export is ready. You can download it from the following link: <a href="${urlToDownload}">${urlToDownload}</a></p>`,
   })
@@ -91,7 +91,26 @@ export const exporter = Sentry.GCPFunction.wrapHttpFunction(
       // stringify the data and pipe it to the write_stream
       const stringifier = stringify({
         header: true,
-        columns: ['id', 'title', 'description', 'state', 'labels'],
+        columns: [
+          'id',
+          'title',
+          'description',
+          'labels',
+          'author',
+          'site_name',
+          'original_url',
+          'slug',
+          'updated_at',
+          'saved_at',
+          'type',
+          'published_at',
+          'url',
+          'thumbnail',
+          'read_at',
+          'word_count',
+          'reading_progress_percent',
+          'archived_at',
+        ],
       })
 
       stringifier
@@ -113,23 +132,50 @@ export const exporter = Sentry.GCPFunction.wrapHttpFunction(
       })
 
       let cursor = 0
+      let hasNext = false
       do {
         const response = await omnivore.items.search({
-          first: 50,
+          first: 100,
           after: cursor,
+          includeContent: false,
         })
 
         const items = response.edges.map((edge) => edge.node)
         cursor = response.pageInfo.endCursor
           ? parseInt(response.pageInfo.endCursor)
           : 0
+        hasNext = response.pageInfo.hasNextPage
 
         // write data to the csv file
         if (items.length > 0) {
           // write the list of urls, state and labels to the stream
-          items.forEach((row) => stringifier.write(row))
+          items.forEach((item) =>
+            stringifier.write({
+              id: item.id,
+              title: item.title,
+              description: item.description,
+              labels: item.labels?.map((label) => label.name).join(','),
+              author: item.author,
+              site_name: item.siteName,
+              original_url: item.originalArticleUrl,
+              slug: item.slug,
+              updated_at: item.updatedAt,
+              saved_at: item.savedAt,
+              type: item.pageType,
+              published_at: item.publishedAt,
+              url: item.url,
+              thumbnail: item.image,
+              read_at: item.readAt,
+              word_count: item.wordsCount,
+              reading_progress_percent: item.readingProgressPercent,
+              archived_at: item.archivedAt,
+            })
+          )
+
+          // sleep for 1 second to avoid rate limiting
+          await new Promise((resolve) => setTimeout(resolve, 1000))
         }
-      } while (cursor)
+      } while (hasNext)
 
       stringifier.end()
 
@@ -137,7 +183,6 @@ export const exporter = Sentry.GCPFunction.wrapHttpFunction(
       const signedUrl = await createSignedUrl(file)
       console.log('signed url', signedUrl)
 
-      // TODO: get the user's email from the database
       await sendExportCompletedEmail(redisDataSource, claims.uid, signedUrl)
 
       console.log('done')
diff --git a/packages/export-handler/src/job.ts b/packages/export-handler/src/job.ts
index 69ea6bb79..0f040b8f3 100644
--- a/packages/export-handler/src/job.ts
+++ b/packages/export-handler/src/job.ts
@@ -5,7 +5,7 @@ const QUEUE_NAME = 'omnivore-backend-queue'
 export const SEND_EMAIL_JOB = 'send-email'
 
 interface SendEmailJobData {
-  to: string
+  userId: string
   from?: string
   subject?: string
   html?: string
diff --git a/packages/import-handler/src/index.ts b/packages/import-handler/src/index.ts
index 06617dfe2..672310954 100644
--- a/packages/import-handler/src/index.ts
+++ b/packages/import-handler/src/index.ts
@@ -13,7 +13,7 @@ import { importCsv } from './csv'
 import { queueEmailJob } from './job'
 import { importMatterArchive } from './matterHistory'
 import { ImportStatus, updateMetrics } from './metrics'
-import { CONTENT_FETCH_URL, createCloudTask, emailUserUrl } from './task'
+import { CONTENT_FETCH_URL, createCloudTask } from './task'
 
 export enum ArticleSavingRequestStatus {
   Failed = 'FAILED',
@@ -118,28 +118,6 @@ const importURL = async (
   })
 }
 
-const createEmailCloudTask = async (userId: string, payload: unknown) => {
-  if (!process.env.JWT_SECRET) {
-    throw 'Envrionment not setup correctly'
-  }
-
-  const exp = Math.floor(Date.now() / 1000) + 60 * 60 * 24 // 1 day
-  const authToken = (await signToken(
-    { uid: userId, exp },
-    process.env.JWT_SECRET
-  )) as string
-  const headers = {
-    'Omnivore-Authorization': authToken,
-  }
-
-  return createCloudTask(
-    emailUserUrl(),
-    payload,
-    headers,
-    'omnivore-email-queue'
-  )
-}
-
 const sendImportFailedEmail = async (
   redisDataSource: RedisDataSource,
   userId: string
diff --git a/packages/import-handler/src/task.ts b/packages/import-handler/src/task.ts
index 94b3352cc..bccca7ecb 100644
--- a/packages/import-handler/src/task.ts
+++ b/packages/import-handler/src/task.ts
@@ -3,14 +3,6 @@ import { CloudTasksClient, protos } from '@google-cloud/tasks'
 
 const cloudTask = new CloudTasksClient()
 
-export const emailUserUrl = () => {
-  const envar = process.env.INTERNAL_SVC_ENDPOINT
-  if (envar) {
-    return envar + 'api/user/email'
-  }
-  throw 'INTERNAL_SVC_ENDPOINT not set'
-}
-
 export const CONTENT_FETCH_URL = process.env.CONTENT_FETCH_GCF_URL
 
 export const createCloudTask = async (