diff --git a/NetTally/App.config b/NetTally/App.config
index 3f438443..1beff4ea 100644
--- a/NetTally/App.config
+++ b/NetTally/App.config
@@ -14,6 +14,9 @@
             <setting name="Upgraded" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="UseSpoilerForVoters" serializeAs="String">
+                <value>False</value>
+            </setting>
         </NetTally.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/NetTally/MainWindow.xaml b/NetTally/MainWindow.xaml
index f37ac3a8..e05ec2da 100644
--- a/NetTally/MainWindow.xaml
+++ b/NetTally/MainWindow.xaml
@@ -47,7 +47,7 @@
         <CheckBox x:Name="partitionedVotes" Content="Partition Votes" Margin="318,45,0,0" VerticalAlignment="Top"
                   IsChecked="{Binding Path=CurrentItem.UseVotePartitions}" HorizontalAlignment="Left" Width="95"
                   IsEnabled="{Binding ElementName=tallyButton, Path=IsEnabled, Converter={StaticResource BoolConverter}, ConverterParameter=Normal, Mode=OneWay}"/>
-        <StackPanel HorizontalAlignment="Left" Height="51" Margin="418,45,0,0" VerticalAlignment="Top" Width="87"
+        <StackPanel HorizontalAlignment="Left" Height="39" Margin="418,45,0,0" VerticalAlignment="Top" Width="87"
                     IsEnabled="{Binding ElementName=tallyButton, Path=IsEnabled, Converter={StaticResource BoolConverter}, ConverterParameter=Normal, Mode=OneWay}">
             <RadioButton x:Name="partitionByLine" Content="By Line" HorizontalAlignment="Left" VerticalAlignment="Top"
         		GroupName="PartitionType" IsChecked="{Binding Path=CurrentItem.PartitionByLine, ConverterParameter=Normal, Converter={StaticResource BoolConverter}}"
@@ -56,6 +56,8 @@
         		GroupName="PartitionType" IsChecked="{Binding ElementName=partitionByLine, Path=IsChecked, ConverterParameter=Invert, Converter={StaticResource BoolConverter}, Mode=OneWay}"
         		IsEnabled="{Binding IsChecked, ElementName=partitionedVotes}"/>
         </StackPanel>
+        <CheckBox x:Name="useSpoilerForVoters" Content="Use Spoiler for Voters" HorizontalAlignment="Left" Margin="318,80,0,0" VerticalAlignment="Top"
+                  IsChecked="{Binding Path=UseSpoilerForVoters}"/>
         <Button x:Name="clearTallyCacheButton" Height="47" Margin="0,10,173,0" VerticalAlignment="Top" Click="clearTallyCacheButton_Click" HorizontalAlignment="Right" Width="49"
                 IsEnabled="{Binding ElementName=tallyButton, Path=IsEnabled, Converter={StaticResource BoolConverter}, ConverterParameter=Normal, Mode=OneWay}">
             <TextBlock TextWrapping="Wrap" TextAlignment="Center">Clear Cache</TextBlock>
diff --git a/NetTally/MainWindow.xaml.cs b/NetTally/MainWindow.xaml.cs
index 54e4ec13..40aab34e 100644
--- a/NetTally/MainWindow.xaml.cs
+++ b/NetTally/MainWindow.xaml.cs
@@ -51,10 +51,13 @@ public MainWindow()
             // Set the current item
             QuestCollectionView.MoveCurrentTo(questCollection[wrapper.CurrentQuest]);
 
+            Properties.Settings settings = new Properties.Settings();
+            tally.UseSpoilerForVoters = settings.UseSpoilerForVoters;
 
             // Set up data contexts
             DataContext = QuestCollectionView;
             resultsWindow.DataContext = tally;
+            useSpoilerForVoters.DataContext = tally;
         }
 
         /// <summary>
@@ -72,6 +75,10 @@ private void Window_Closing(object sender, CancelEventArgs e)
             }
             QuestCollectionWrapper qcw = new QuestCollectionWrapper(questCollection, selectedQuest);
             NetTallyConfig.Save(tally, qcw);
+
+            Properties.Settings settings = new Properties.Settings();
+            settings.UseSpoilerForVoters = tally.UseSpoilerForVoters;
+            settings.Save();
         }
         #endregion
 
diff --git a/NetTally/Properties/Settings.Designer.cs b/NetTally/Properties/Settings.Designer.cs
index 5f7cc53b..8afe6985 100644
--- a/NetTally/Properties/Settings.Designer.cs
+++ b/NetTally/Properties/Settings.Designer.cs
@@ -34,5 +34,17 @@ public bool Upgraded {
                 this["Upgraded"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool UseSpoilerForVoters {
+            get {
+                return ((bool)(this["UseSpoilerForVoters"]));
+            }
+            set {
+                this["UseSpoilerForVoters"] = value;
+            }
+        }
     }
 }
diff --git a/NetTally/Properties/Settings.settings b/NetTally/Properties/Settings.settings
index 9bcbd5d0..68f02782 100644
--- a/NetTally/Properties/Settings.settings
+++ b/NetTally/Properties/Settings.settings
@@ -5,5 +5,8 @@
     <Setting Name="Upgraded" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="UseSpoilerForVoters" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/TallyCore/Tally.cs b/TallyCore/Tally.cs
index feed1fef..d3d9bccc 100644
--- a/TallyCore/Tally.cs
+++ b/TallyCore/Tally.cs
@@ -66,6 +66,25 @@ public string TallyResults
             }
         }
 
+        bool useSpoilerForVoters = false;
+        public bool UseSpoilerForVoters
+        {
+            get { return useSpoilerForVoters; }
+            set
+            {
+                useSpoilerForVoters = value;
+                UpdateResults();
+            }
+        }
+
+
+        IQuest lastTallyQuest = null;
+        private void UpdateResults()
+        {
+            if (lastTallyQuest != null)
+                ConstructResults(lastTallyQuest);
+        }
+
         #endregion
 
         #region Interface functions
@@ -121,6 +140,8 @@ public void ClearPageCache()
         /// </summary>
         private void ConstructResults(IQuest quest)
         {
+            lastTallyQuest = quest;
+
             StringBuilder sb = new StringBuilder();
 
             var assembly = Assembly.GetExecutingAssembly();
@@ -142,6 +163,11 @@ private void ConstructResults(IQuest quest)
                 sb.Append(vote.Value.Count);
                 sb.AppendLine("[/b]");
 
+                if (UseSpoilerForVoters)
+                {
+                    sb.AppendLine("[spoiler=Voters]");
+                }
+
                 sb.Append(GenerateSupporterUrl(quest, vote.Value.First()));
 
                 var remainder = vote.Value.Skip(1);
@@ -149,6 +175,11 @@ private void ConstructResults(IQuest quest)
                 foreach (var supporter in vote.Value.Skip(1).OrderBy(v => v))
                     sb.Append(GenerateSupporterUrl(quest, supporter));
 
+                if (UseSpoilerForVoters)
+                {
+                    sb.AppendLine("[/spoiler]");
+                }
+
                 sb.AppendLine("");
             }