diff --git a/apps/forum/models.py b/apps/forum/models.py
index 10d7134..0ae974b 100644
--- a/apps/forum/models.py
+++ b/apps/forum/models.py
@@ -199,7 +199,8 @@ class Post(models.Model):
             raise Exception('Invalid markup property: %s' % self.markup)
         self.body_text = strip_tags(self.body_html)
         self.body_html = urlize(self.body_html)
-        self.body_html = smiles(self.body_html)
+        if forum_settings.SMILES_SUPPORT:
+            self.body_html = smiles(self.body_html)
         super(Post, self).save(*args, **kwargs)
 
     def get_absolute_url(self):
@@ -345,8 +346,8 @@ class PrivateMessage(models.Model):
             raise Exception('Invalid markup property: %s' % self.markup)
         self.body_text = strip_tags(self.body_html)
         self.body_html = urlize(self.body_html)
-        self.body_html = smiles(self.body_html)
-        
+        if forum_settings.SMILES_SUPPORT:
+            self.body_html = smiles(self.body_html)
         new = self.id is None
         super(PrivateMessage, self).save(*args, **kwargs)
     
diff --git a/apps/forum/settings.py b/apps/forum/settings.py
index 88a78c4..b3105cf 100644
--- a/apps/forum/settings.py
+++ b/apps/forum/settings.py
@@ -84,4 +84,5 @@ SMILES = ((r'(:|=)\)', EMOTION_SMILE), #:), =)
           (r':rolleyes:', EMOTION_ROLL),
           (r':cool:', EMOTION_COOL)
          )
-SMILES = get('SMILES', SMILES)
\ No newline at end of file
+SMILES = get('SMILES', SMILES)
+SMILES_SUPPORT = get('SMILES_SUPPORT', True)
\ No newline at end of file