diff --git a/package.json b/package.json
index aa26e49..8f06d0b 100644
--- a/package.json
+++ b/package.json
@@ -277,6 +277,7 @@
     "react-sizeme": "^3.0.1",
     "regenerator-runtime": "^0.13.5",
     "source-map-support": "^0.5.19",
+    "unidecode-plus": "^1.0.4",
     "xlsx": "^0.17.0"
   },
   "devEngines": {
diff --git a/src/components/merge/MailMerge.tsx b/src/components/merge/MailMerge.tsx
index 9a36930..6d8a302 100644
--- a/src/components/merge/MailMerge.tsx
+++ b/src/components/merge/MailMerge.tsx
@@ -30,6 +30,7 @@ const MailMerge = ({ configPath }: MailMergeProps) => {
   const [outputPdf, setOutputPdf] = useState('');
   const [smtpValid, setSmtpValid] = useState(false);
   const [tab, setTab] = useState('local');
+  const [filename, setFilename] = useState('');
 
   const tagSettings = {
     pattern: /@/,
@@ -65,6 +66,10 @@ const MailMerge = ({ configPath }: MailMergeProps) => {
     setBody(e.detail.value);
   };
 
+  const handleChangeFilename = (e: any) => {
+    setFilename(e.detail.value);
+  };
+
   const handleChooseFile = () => {
     const name = 'PDF file';
     const extensions = ['pdf'];
@@ -76,20 +81,21 @@ const MailMerge = ({ configPath }: MailMergeProps) => {
 
   const handleSendEmail = async () => {
     setSending(true);
+    const conf = { ...pdfConfig, filename };
     await ipcRenderer.invoke(
       'send-email',
       fromEmail,
       emailIndex,
       subject,
       body,
-      pdfConfig
+      conf
     );
     setSending(false);
   };
 
   const handleSavePdf = async () => {
     setSaving(true);
-    const conf = { ...pdfConfig, combinePdf, outputPdf };
+    const conf = { ...pdfConfig, combinePdf, outputPdf, filename };
     await ipcRenderer.invoke('save-pdf', conf);
     setSaving(false);
   };
@@ -117,7 +123,7 @@ const MailMerge = ({ configPath }: MailMergeProps) => {
             <button
               type="button"
               onClick={() => setTab('local')}
-              className={`inline-flex outline-none appearance-none items-center px-4 py-4 text-sm font-medium text-center border-b-2 border-transparent rounded-t-lg group ${
+              className={`inline-flex outline-none appearance-none items-center px-4 pt-4 pb-2 text-sm font-medium text-center border-b-2 border-transparent rounded-t-lg group ${
                 tab === 'email'
                   ? 'text-gray-500 hover:text-gray-600 hover:border-gray-300'
                   : 'text-blue-600 border-blue-600'
@@ -131,7 +137,7 @@ const MailMerge = ({ configPath }: MailMergeProps) => {
             <button
               type="button"
               onClick={() => setTab('email')}
-              className={`inline-flex outline-none appearance-none items-center px-4 py-4 text-sm font-medium text-center border-b-2 rounded-t-lg active group ${
+              className={`inline-flex outline-none appearance-none items-center px-4 pt-4 pb-2 text-sm font-medium text-center border-b-2 rounded-t-lg active group ${
                 tab === 'local'
                   ? 'text-gray-500 hover:text-gray-600 hover:border-gray-300'
                   : 'text-blue-600 border-blue-600'
@@ -189,6 +195,29 @@ const MailMerge = ({ configPath }: MailMergeProps) => {
               </label>
             ) : null}
           </section>
+
+          {!combinePdf && (
+            <div className="flex flex-col space-y-2">
+              <section className="flex items-center justify-between space-y-2">
+                <p className="font-medium">Filename:</p>
+                <small className="text-xs text-right opacity-70">
+                  Type @ to insert column values into the filename
+                </small>
+              </section>
+              <Tags
+                placeholder="Filename"
+                InputMode="textarea"
+                onChange={handleChangeFilename}
+                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                // @ts-ignore
+                settings={tagSettings}
+                whitelist={headers.map(({ index, label }) => ({
+                  id: index,
+                  value: label,
+                }))}
+              />
+            </div>
+          )}
         </section>
 
         <section className="flex flex-col items-start justify-center space-y-8">
@@ -308,6 +337,27 @@ const MailMerge = ({ configPath }: MailMergeProps) => {
               }))}
             />
           </div>
+
+          <div className="flex flex-col space-y-2">
+            <section className="flex items-center justify-between space-y-2">
+              <p className="font-medium">Filename:</p>
+              <small className="text-xs text-right opacity-70">
+                Type @ to insert column values into the filename
+              </small>
+            </section>
+            <Tags
+              placeholder="Filename"
+              InputMode="textarea"
+              onChange={handleChangeFilename}
+              // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+              // @ts-ignore
+              settings={tagSettings}
+              whitelist={headers.map(({ index, label }) => ({
+                id: index,
+                value: label,
+              }))}
+            />
+          </div>
         </section>
 
         <section className="flex flex-col items-start justify-center mb-10 space-y-8">
diff --git a/src/components/pdf/PdfEditor.tsx b/src/components/pdf/PdfEditor.tsx
index cd386d9..e588fca 100644
--- a/src/components/pdf/PdfEditor.tsx
+++ b/src/components/pdf/PdfEditor.tsx
@@ -40,6 +40,7 @@ export interface RenderPdfState {
   canvasData?: Record<number, CanvasObjects>;
   formData?: Record<string, number>;
   configPath?: string;
+  filename?: string;
 }
 interface FieldType {
   type: string;
diff --git a/src/main.dev.ts b/src/main.dev.ts
index f8dda7b..f26fe40 100644
--- a/src/main.dev.ts
+++ b/src/main.dev.ts
@@ -218,28 +218,20 @@ const savePdf = async (params: RenderPdfState) => {
     return;
   }
 
-  const {
-    pdfFile,
-    excelFile,
-    combinePdf,
-    canvasData,
-    formData,
-    outputPdf,
-  } = params;
-
   try {
-    const created = await renderPdf(
-      outputPdf,
-      pdfFile,
-      excelFile,
-      getRowsLimit(),
-      combinePdf,
-      writeFile,
-      (page, total) =>
+    const created = await renderPdf({
+      output: params.outputPdf,
+      pdfFile: params.pdfFile,
+      excelFile: params.excelFile,
+      rowsLimit: getRowsLimit(),
+      combinePdf: params.combinePdf,
+      saveFileFunc: writeFile,
+      updateProgressFunc: (page, total) =>
         mailMergeWindow?.webContents.send('save-progress', { page, total }),
-      canvasData,
-      formData
-    );
+      canvasData: params.canvasData,
+      formData: params.formData,
+      filenameTemplate: params.filename,
+    });
 
     if (created > 0) {
       if (Notification.isSupported()) {
@@ -294,24 +286,22 @@ const previewPdf = async (params: RenderPdfState) => {
     return;
   }
 
-  const { pdfFile, excelFile, canvasData, formData } = params;
-
   try {
     const output = path.join(
       app.getPath('temp'),
-      `preview-${path.basename(pdfFile)}`
+      `preview-${path.basename(params.pdfFile)}`
     );
-    await renderPdf(
+    await renderPdf({
       output,
-      pdfFile,
-      excelFile,
-      1,
-      true,
-      writeFile,
-      () => {},
-      canvasData,
-      formData || {}
-    );
+      pdfFile: params.pdfFile,
+      excelFile: params.excelFile,
+      rowsLimit: 1,
+      combinePdf: true,
+      saveFileFunc: writeFile,
+      updateProgressFunc: () => {},
+      canvasData: params.canvasData,
+      formData: params.formData || {},
+    });
     openPdf(output);
   } catch (e) {
     dialog.showErrorBox('Preview failed', e.message);
@@ -369,7 +359,7 @@ const sendMailFunc = (
   emailIndex: number,
   subjectTemplate: string,
   bodyTemplate: string
-) => async (fileName: string, buffer: Uint8Array, rowData?: RowMap) => {
+) => async (filename: string, buffer: Uint8Array, rowData?: RowMap) => {
   const config = store.get('smtp-config');
 
   const transporter = nodemailer.createTransport({
@@ -397,7 +387,7 @@ const sendMailFunc = (
     html: text,
     attachments: [
       {
-        filename: path.basename(fileName),
+        filename: path.basename(filename),
         content: buffer,
       },
     ],
@@ -425,21 +415,29 @@ const sendPdfMail = async (
   bodyTemplate: string,
   params: RenderPdfState
 ) => {
-  const { pdfFile, excelFile, canvasData, formData } = params;
   try {
-    const output = path.join(app.getPath('temp'), path.basename(pdfFile));
+    const output = path.join(
+      app.getPath('temp'),
+      path.basename(params.pdfFile)
+    );
 
-    const created = await renderPdf(
+    const created = await renderPdf({
       output,
-      pdfFile,
-      excelFile,
-      getRowsLimit(),
-      false,
-      sendMailFunc(fromEmail, emailIndex, subjectTemplate, bodyTemplate),
-      emailProgressFunc(emailIndex),
-      canvasData,
-      formData
-    );
+      pdfFile: params.pdfFile,
+      excelFile: params.excelFile,
+      rowsLimit: getRowsLimit(),
+      combinePdf: false,
+      saveFileFunc: sendMailFunc(
+        fromEmail,
+        emailIndex,
+        subjectTemplate,
+        bodyTemplate
+      ),
+      updateProgressFunc: emailProgressFunc(emailIndex),
+      canvasData: params.canvasData,
+      formData: params.formData,
+      filenameTemplate: params.filename,
+    });
 
     if (created > 0) {
       if (Notification.isSupported()) {
diff --git a/src/package.json b/src/package.json
index 0f2b139..b876407 100644
--- a/src/package.json
+++ b/src/package.json
@@ -1,7 +1,7 @@
 {
   "name": "plainmerge",
   "productName": "PlainMerge",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "Offline PDF mail merger",
   "main": "./main.prod.js",
   "author": {
diff --git a/src/render.ts b/src/render.ts
index ff4604f..7b9b702 100644
--- a/src/render.ts
+++ b/src/render.ts
@@ -22,6 +22,8 @@ import fs from 'fs';
 import { promisify } from 'util';
 import XLSX from 'xlsx';
 import QRCode from 'qrcode';
+import unidecode from 'unidecode-plus';
+import path from 'path';
 
 const readFile = promisify(fs.readFile);
 
@@ -41,6 +43,7 @@ export interface RenderPdfState {
   outputPdf: string;
   canvasData?: CanvasMap;
   formData?: FormMap;
+  filename?: string;
 }
 
 export type RowMap = Record<number, string>;
@@ -92,11 +95,11 @@ const sheetToArray = (sheet: XLSX.WorkSheet) => {
   return result;
 };
 
-const readFirstSheet = (path: string, rowsLimit: number) => {
+const readFirstSheet = (filepath: string, rowsLimit: number) => {
   const headerOffset = 1;
   const sheetRows = rowsLimit + headerOffset;
 
-  const workbook = XLSX.readFile(path, { sheetRows });
+  const workbook = XLSX.readFile(filepath, { sheetRows });
   const sheetsList = workbook.SheetNames;
   const firstSheet = workbook.Sheets[sheetsList[0]];
   const rows = sheetToArray(firstSheet)
@@ -289,39 +292,45 @@ export const loadForm = async (filename: string) => {
     .filter((v) => v.type);
 };
 
-const renderPdf = async (
-  output: string,
-  pdfFile: string,
-  excelFile: string,
-  rowsLimit: number,
-  combinePdf: boolean,
-  saveFile: (
+interface RenderPDFParams {
+  output: string;
+  pdfFile: string;
+  excelFile: string;
+  rowsLimit: number;
+  combinePdf: boolean;
+  saveFileFunc: (
     filename: string,
     content: Uint8Array,
     rowData?: RowMap
-  ) => Promise<void>,
-  updateProgress: (page: number, total: number, rowData?: RowMap) => void,
-  canvasData?: CanvasMap,
-  formData?: FormMap
-) => {
-  const pdfBuff = await readFile(pdfFile);
+  ) => Promise<void>;
+  updateProgressFunc: (page: number, total: number, rowData?: RowMap) => void;
+  canvasData?: CanvasMap;
+  formData?: FormMap;
+  filenameTemplate?: string;
+}
+
+const renderPdf = async (params: RenderPDFParams) => {
+  const pdfBuff = await readFile(params.pdfFile);
   let pdfDoc = await PDFDocument.load(pdfBuff);
   let newDoc = await PDFDocument.create();
   let cachedFonts: FontMap = {};
 
-  const rows: RowMap[] = readFirstSheet(excelFile, rowsLimit);
+  const rows: RowMap[] = readFirstSheet(params.excelFile, params.rowsLimit);
   for (let i = 0; i < rows.length; i += 1) {
+    const rowData = rows[i];
+
     // Step 1: Render pages with form
-    renderForm(rows[i], formData, pdfDoc.getForm());
+    renderForm(rows[i], params.formData, pdfDoc.getForm());
 
     // Step 2: Render pages with canvas for now
-    if (canvasData) {
+    if (params.canvasData) {
+      const { canvasData } = params;
       await Promise.all(
         pdfDoc.getPageIndices().map(async (pageIndex) => {
           if (canvasData[pageIndex + 1]) {
             const page = pdfDoc.getPage(pageIndex);
             await renderPage(
-              rows[i],
+              rowData,
               page,
               pdfDoc,
               cachedFonts,
@@ -339,17 +348,39 @@ const renderPdf = async (
     );
 
     newPages.forEach((p) => newDoc.addPage(p));
-    updateProgress(i + 1, rows.length, rows[i]);
+    params.updateProgressFunc(i + 1, rows.length, rowData);
 
-    if (!combinePdf) {
+    if (!params.combinePdf) {
       const pdfBytes = await newDoc.save();
-      const outputs = output.split('.');
+      const fileDir = path.dirname(params.output);
+      const fileEx = path.extname(params.output);
+
+      // Render filename
+      let filename = '';
+      if (params.filenameTemplate) {
+        const searchValue = /\[\[(.*?)\]\]/g;
+        const replaceValue = (_a: string, b: string) =>
+          rowData[JSON.parse(b).id] || '';
+
+        filename = params.filenameTemplate
+          .replace(searchValue, replaceValue)
+          .trim();
+      }
 
-      const baseName = outputs.slice(0, outputs.length - 1).join('.');
-      const fileEx = outputs[outputs.length - 1];
-      const outputName = `${baseName}-${i + 1}.${fileEx}`;
+      if (filename === '') {
+        const basename = path.basename(params.output);
+        const parts = basename.split('.');
+        const fileBase = parts.slice(0, parts.length - 1).join('.');
+        filename = `${fileBase}_${i + 1}`;
+      }
 
-      await saveFile(outputName, pdfBytes, rows[i]);
+      filename = unidecode(filename).replace(/[^a-z0-9]/gi, '_');
+      const outputName = `${filename}${fileEx}`;
+      await params.saveFileFunc(
+        path.join(fileDir, outputName),
+        pdfBytes,
+        rowData
+      );
 
       // Reset
       newDoc = await PDFDocument.create();
@@ -360,9 +391,9 @@ const renderPdf = async (
     pdfDoc = await PDFDocument.load(pdfBuff);
   }
 
-  if (combinePdf) {
+  if (params.combinePdf) {
     const pdfBytes = await newDoc.save();
-    await saveFile(output, pdfBytes);
+    await params.saveFileFunc(params.output, pdfBytes);
     return 1;
   }
 
diff --git a/yarn.lock b/yarn.lock
index a0bc2f7..acb2e61 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12295,6 +12295,11 @@ unicode-property-aliases-ecmascript@^1.0.4:
   resolved "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz"
   integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==
 
+unidecode-plus@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/unidecode-plus/-/unidecode-plus-1.0.4.tgz#8f65fd399c87e7165f11fb70f7a2e7e0268e5f22"
+  integrity sha512-KG6C6EFzic7ViDmuI2Z0R7e6fnALtTWUkTH5QrL0Pl9EGRWwwwGmskXaItkerfl5CD5H9p9M/kbaMxX7TJRuOQ==
+
 union-value@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz"