diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
index b6709de12..4acad08b3 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
@@ -330,6 +330,10 @@ public class Configuration {
     @ConfigurationCategory("export")
     public static final ConfigurationItem<String> textExportSingleFileRecordSeparator = null;
 
+    @ConfigurationDefaultBoolean(true)
+    @ConfigurationCategory("export")
+    public static final ConfigurationItem<Boolean> addCharacterIdToExportFileName = null;
+
     @ConfigurationCategory("import")
     public static final ConfigurationItem<TextImportResizeTextBoundsMode> textImportResizeTextBoundsMode = null;
 
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/CharacterIdTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/CharacterIdTag.java
index 14ed5a092..a1052ce21 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/CharacterIdTag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/CharacterIdTag.java
@@ -1,21 +1,23 @@
 /*
  *  Copyright (C) 2010-2015 JPEXS, All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3.0 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
 */
+ * License along with this library.
+ */
 package com.jpexs.decompiler.flash.tags.base;
 
 import com.jpexs.decompiler.flash.SWF;
+import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.decompiler.flash.tags.Tag;
 import com.jpexs.helpers.ByteArrayRange;
 
@@ -57,7 +59,12 @@ public abstract class CharacterIdTag extends Tag {
 
     @Override
     public String getExportFileName() {
-        return super.getName() + "_" + getCharacterId() + (exportName != null ? "_" + exportName : "");
+        String result = super.getName();
+        if (Configuration.addCharacterIdToExportFileName.get()) {
+            result += "_" + getCharacterId();
+        }
+
+        return result + (exportName != null ? "_" + exportName : "");
     }
 
     public String getCharacterExportFileName() {
diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties
index f903aa6fd..79135a69b 100644
--- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties
@@ -308,3 +308,6 @@ config.description.textImportResizeTextBoundsMode = Text bounds resize mode afte
 
 config.name.showCloseConfirmation = Show again SWF close confirmation
 config.description.showCloseConfirmation = Show again SWF close confirmation for modified files. 
+
+config.name.addCharacterIdToExportFileName = Include character ID in export filename
+config.description.addCharacterIdToExportFileName = Include character ID in export filename. 
diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_hu.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_hu.properties
index c42125cdb..aebd001a8 100644
--- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_hu.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_hu.properties
@@ -308,3 +308,6 @@ config.description.textImportResizeTextBoundsMode = Sz\u00f6veg hat\u00e1r \u00e
 
 config.name.showCloseConfirmation = SWF bez\u00e1r\u00e1si meger\u0151s\u00edt\u00e9s \u00fajb\u00f3li mutat\u00e1sa
 config.description.showCloseConfirmation = SWF bez\u00e1r\u00e1si meger\u0151s\u00edt\u00e9s \u00fajb\u00f3li mutat\u00e1sa m\u00f3dosult f\u00e1jlok eset\u00e9n.
+
+config.name.addCharacterIdToExportFileName = Karakter azonos\u00edt\u00f3 hozz\u00e1ad\u00e1sa az export\u00e1lt f\u00e1jl nev\u00e9hez
+config.description.addCharacterIdToExportFileName = Karakter azonos\u00edt\u00f3 hozz\u00e1ad\u00e1sa az export\u00e1lt f\u00e1jl nev\u00e9hez.