diff --git a/app/jobs/regular/export_csv_file.rb b/app/jobs/regular/export_csv_file.rb
index 4f80a7bd6..0382089cd 100644
--- a/app/jobs/regular/export_csv_file.rb
+++ b/app/jobs/regular/export_csv_file.rb
@@ -5,7 +5,7 @@ module Jobs
 
   class ExportCsvFile < Jobs::Base
     HEADER_ATTRS_FOR = {}
-    HEADER_ATTRS_FOR['user_archive'] = ['raw','like_count','reply_count','created_at']
+    HEADER_ATTRS_FOR['user_archive'] = ['topic_title','category','sub_category','is_pm','post','like_count','reply_count','url','created_at']
     HEADER_ATTRS_FOR['user'] = ['id','name','username','email','title','created_at','trust_level','active','admin','moderator','ip_address']
     HEADER_ATTRS_FOR['user_stats'] = ['topics_entered','posts_read_count','time_read','topic_count','post_count','likes_given','likes_received']
     HEADER_ATTRS_FOR['user_sso'] = ['external_id','external_email', 'external_username', 'external_name', 'external_avatar_url']
@@ -45,11 +45,12 @@ module Jobs
         write_csv_file(data, header)
       end
 
+    ensure
       notify_user
     end
 
     def user_archive_export
-      user_archive_data = Post.where(user_id: @current_user.id).select(HEADER_ATTRS_FOR['user_archive']).with_deleted.to_a
+      user_archive_data = Post.includes(:topic => :category).where(user_id: @current_user.id).select('topic_id','post_number','raw','like_count','reply_count','created_at').order('created_at').with_deleted.to_a
       user_archive_data.map do |user_archive|
         get_user_archive_fields(user_archive)
       end
@@ -129,9 +130,29 @@ module Jobs
 
       def get_user_archive_fields(user_archive)
         user_archive_array = []
+        topic_data = user_archive.topic
+        user_archive = user_archive.as_json
+        category = topic_data.category
+        sub_category = "-"
+        if category
+          category_name = category.name
+          if !category.parent_category_id.nil?
+            # sub category
+            category_name = Category.find_by(id: category.parent_category_id).name
+            sub_category = category.name
+          end
+        else
+          # PM
+          category_name = "-"
+        end
+        is_pm = topic_data.archetype == "private_message" ? I18n.t("csv_export.boolean_yes") : I18n.t("csv_export.boolean_no")
+        url = "#{Discourse.base_url}/t/#{topic_data.slug}/#{topic_data.id}/#{user_archive['post_number']}"
+
+        topic_hash = {"post" => user_archive['raw'], "topic_title" => topic_data.title, "category" => category_name, "sub_category" => sub_category, "is_pm" => is_pm, "url" => url}
+        user_archive.merge!(topic_hash)
 
         HEADER_ATTRS_FOR['user_archive'].each do |attr|
-          user_archive_array.push(user_archive.attributes[attr])
+          user_archive_array.push(user_archive[attr])
         end
 
         user_archive_array
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index a58fd3fae..6f80709df 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1852,6 +1852,10 @@ en:
 
   edit_this_page: "Edit this page"
 
+  csv_export:
+    boolean_yes: "Yes"
+    boolean_no: "No"
+
   static_topic_first_reply: |
     Edit the first post in this topic to change the contents of the %{page_name} page.