Also trim question marks

src/NzbDrone.Core.Test/OrganizerTests/GetNewFilenameFixture.cs

@@ -385,6 +385,23 @@ namespace NzbDrone.Core.Test.OrganizerTests
                             .Build();
 
 
+            Subject.BuildFilename(new List<Episode> { episode }, new Series { Title = "30 Rock" }, _episodeFile)
+                   .Should().Be("30 Rock - S06E06 - Part 1");
+        }
+
+        [Test]
+        public void should_trim_question_marks_from_end_of_episode_title()
+        {
+            _namingConfig.StandardEpisodeFormat = "{Series Title} - S{season:00}E{episode:00} - {Episode Title}";
+            _namingConfig.MultiEpisodeStyle = 3;
+
+            var episode = Builder<Episode>.CreateNew()
+                            .With(e => e.Title = "Part 1?")
+                            .With(e => e.SeasonNumber = 6)
+                            .With(e => e.EpisodeNumber = 6)
+                            .Build();
+
+
             Subject.BuildFilename(new List<Episode> { episode }, new Series { Title = "30 Rock" }, _episodeFile)
                    .Should().Be("30 Rock - S06E06 - Part 1");
         }

src/NzbDrone.Core/Organizer/FileNameBuilder.cs

@@ -44,7 +44,7 @@ namespace NzbDrone.Core.Organizer
         public static readonly Regex SeriesTitleRegex = new Regex(@"(?<token>\{(?:Series)(?<separator>\s|\.|-|_)Title\})",
                                                                             RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
-        private static readonly char[] EpisodeTitleTrimCharaters = new[] { ' ', '.' };
+        private static readonly char[] EpisodeTitleTrimCharaters = new[] { ' ', '.', '?' };
 
         public FileNameBuilder(INamingConfigService namingConfigService,
                                IQualityDefinitionService qualityDefinitionService,