diff --git a/helpers/html.php b/helpers/html.php
index f8df46d..146f8cd 100644
--- a/helpers/html.php
+++ b/helpers/html.php
@@ -99,3 +99,11 @@
 		return $date.' '.gmdate($time_format, $timestamp);
 	}
 });
+
+//
+// A wrapper for PHP's number_format function
+//
+HTML::macro('number_format', function($number, $decimals = 0)
+{
+	return is_numeric($number) ? number_format($number, $decimals, __('fluxbb::common.lang_decimal_point'), __('fluxbb::common.lang_thousands_sep')) : $number;
+});
diff --git a/language/en/common.php b/language/en/common.php
index 355cfbf..5480951 100644
--- a/language/en/common.php
+++ b/language/en/common.php
@@ -2,6 +2,10 @@
 
 return array(
 
+	// Number formatting
+	'lang_decimal_point'				=>	'.',
+	'lang_thousands_sep'				=>	',',
+
 	'index'			=> 'Index',
 	'user_list'		=> 'User list',
 	'rules'			=> 'Rules',
diff --git a/views/index.blade.php b/views/index.blade.php
index d2dd92c..0783318 100644
--- a/views/index.blade.php
+++ b/views/index.blade.php
@@ -42,7 +42,7 @@
 ?>
 				<tr class="row{{ HTML::oddeven() }}">
 					<td class="tcl">
-						<div class="{{ $icon_type }}"><div class="nosize">{{ number_format($forum_count) }}</div></div><!-- forum_number_format -->
+						<div class="{{ $icon_type }}"><div class="nosize">{{ HTML::number_format($forum_count) }}</div></div>
 						<div class="tclcon">
 							<div>
 <?php
@@ -70,8 +70,8 @@
 							</div>
 						</div>
 					</td>
-					<td class="tc2">{{ number_format($forum->num_topics()) }}</td><!-- forum_number_format -->
-					<td class="tc3">{{ number_format($forum->num_posts()) }}</td><!-- here too -->
+					<td class="tc2">{{ HTML::number_format($forum->num_topics()) }}</td>
+					<td class="tc3">{{ HTML::number_format($forum->num_posts()) }}</td>
 					<td class="tcr">{{ $last_post }}</td>
 				</tr>
 	@endforeach
@@ -81,4 +81,4 @@
 	</div>
 </div>
 @endforeach
-@endsection
\ No newline at end of file
+@endsection
diff --git a/views/viewforum.blade.php b/views/viewforum.blade.php
index 70efc98..b6e0a17 100644
--- a/views/viewforum.blade.php
+++ b/views/viewforum.blade.php
@@ -31,7 +31,7 @@
 ?>
 				<tr class="row{{ HTML::oddeven() }}">
 					<td class="tcl">
-						<div class="{{ $icon_type }}"><div class="nosize">{{ number_format($topic_count + $start_from) }}</div></div><!-- TODO: forum_number_format() -->
+						<div class="{{ $icon_type }}"><div class="nosize">{{ HTML::number_format($topic_count + $start_from) }}</div></div>
 						<div class="tclcon">
 							<div>
 								<a href="{{ URL::to_action('fluxbb::home@topic', array($topic->id)) }}">{{ e($topic->subject) }}</a> <span class="byuser">{{ __('fluxbb::common.by', array('author' => e($topic->poster))) }}</span>
@@ -54,4 +54,4 @@
 	</div>
 </div>
 
-@endsection
\ No newline at end of file
+@endsection
diff --git a/views/viewtopic.blade.php b/views/viewtopic.blade.php
index f59f6f3..fbe6502 100644
--- a/views/viewtopic.blade.php
+++ b/views/viewtopic.blade.php
@@ -29,7 +29,7 @@
 						<dd><span>{{ __('fluxbb::topic.from', array('name' => e($post->poster->location))) }}</span></dd>
 	@endif
 						<dd><span>{{ __('fluxbb::topic.registered', array('time' => HTML::format_time($post->poster->registered, true))) }}</span></dd>
-						<dd><span>{{ __('fluxbb::topic.posts', array('count' => number_format($post->poster->num_posts))) }}</span></dd> <!-- TODO: forum_number_format -->
+						<dd><span>{{ __('fluxbb::topic.posts', array('count' => HTML::number_format($post->poster->num_posts))) }}</span></dd>
 						<dd><span><a href="{{ URL::to_action('fluxbb::moderate@host', array($post->id)) }}" title="{{ $post->poster->ip }}">{{ __('fluxbb::topic.ip') }}</a></span></dd>
 	@if ($post->poster->has_admin_note())
 						<dd><span>{{ __('fluxbb::topic.note') }} <strong>{{ e($post->poster->admin_note) }}</strong></span></dd>
@@ -87,4 +87,4 @@
 </div>
 @endforeach
 
-@endsection
\ No newline at end of file
+@endsection