diff --git a/controllers/public/community_hub_plugin_public_controller.rb b/controllers/public/community_hub_plugin_public_controller.rb
index f062458..90a1784 100644
--- a/controllers/public/community_hub_plugin_public_controller.rb
+++ b/controllers/public/community_hub_plugin_public_controller.rb
@@ -50,14 +50,12 @@ class CommunityHubPluginPublicController < PublicController
         mediation_data = {}
         mediation_data.merge!(params[:article]) if params[:article]
 
-        mediation = TinyMceArticle.new(mediation_data)
+        mediation = CommunityHubPlugin::Mediation.new(mediation_data)
+        mediation.name = CommunityHubPlugin::Mediation.timestamp
         mediation.profile = profile
         mediation.last_changed_by = user
-        mediation.name = mediation_timestamp
-        mediation.notify_comments = false
-        mediation.type = 'TinyMceArticle'
-        mediation.advertise = false
         mediation.created_by_id = user.id
+        mediation.source = 'local'
 
         if mediation && mediation.save
           render :text => {'ok' => true}.to_json, :content_type => 'application/json'
@@ -113,7 +111,7 @@ class CommunityHubPluginPublicController < PublicController
   def newer_articles
     latest_post = params[:latest_post]
     hub = Article.find(params[:hub])
-    posts = Article.find(:all, :order => "id desc", :conditions => ["id > :id and type = :type and parent_id = :hub", { :id => latest_post, :type => 'TinyMceArticle', :hub => hub.id }])
+    posts = CommunityHubPlugin::Mediation.find(:all, :order => "id desc", :conditions => ["id > :id and parent_id = :hub", { :id => latest_post, :hub => hub.id }])
 
     if !posts.empty?
       oldest_post = posts.last.id
@@ -158,11 +156,13 @@ class CommunityHubPluginPublicController < PublicController
 	def pin_message
     if logged_in?
       if (!params[:hub].blank? && !params[:message].blank?)
+
         begin
           hub = Article.find(params[:hub])
         rescue
           hub = nil
         end
+
         if hub && hub.mediator?(user)
           begin
             message = Comment.find(params[:message])
@@ -171,42 +171,37 @@ class CommunityHubPluginPublicController < PublicController
           end
 
           if message
-            mediation = TinyMceArticle.new
-            mediation.profile = hub.profile
-            mediation.parent = hub
-
             author = message.author.blank? ? user : message.author
 
+            mediation = CommunityHubPlugin::Mediation.new
+            mediation.name = CommunityHubPlugin::Mediation.timestamp
+
+            mediation.profile = hub.profile
             mediation.last_changed_by = author
             mediation.created_by_id = author.id
-
-            mediation.name = mediation_timestamp
             mediation.body = message.body
-            mediation.notify_comments = false
-            mediation.type = 'TinyMceArticle'
-            mediation.advertise = false
+            mediation.parent_id = hub.id
             mediation.source = 'local'
 
-            if mediation.save
+            if mediation && mediation.save
 
               if ( message.title == 'hub-message-twitter' )
                 mediation.source = 'twitter'
                 mediation.author_name = message.name
-                mediation.external_link = message.profile_picture
-              elsif ( message.title == 'hub-message-facebook' )
-                mediation.source = 'facebook'
-                mediation.author_name = message.name
+                mediation.profile_picture = message.profile_picture
+                mediation.save
               end
 
-              mediation.save
-
               hub.pinned_messages += [message.id] unless hub.pinned_messages.include?(message.id)
               hub.pinned_mediations += [mediation.id] unless hub.pinned_mediations.include?(mediation.id)
-              if hub.save
+
+              if hub && hub.save
                 render :text => {'ok' => true}.to_json, :content_type => 'application/json'
                 return true
               end
+
             end
+
           end
         end
       end
@@ -217,11 +212,6 @@ class CommunityHubPluginPublicController < PublicController
 
 	protected
 
-  def mediation_timestamp
-    "hub-mediation-#{(Time.now.to_f * 1000).to_i}"
-  end
-
-
   def message_timestamp
     "hub-message-#{(Time.now.to_f * 1000).to_i}"
   end
diff --git a/lib/community_hub_plugin/mediation.rb b/lib/community_hub_plugin/mediation.rb
new file mode 100644
index 0000000..9b615fe
--- /dev/null
+++ b/lib/community_hub_plugin/mediation.rb
@@ -0,0 +1,15 @@
+class CommunityHubPlugin::Mediation < Article
+
+  before_save do |mediation|
+    mediation.advertise = false
+    mediation.notify_comments = false
+    nil
+  end
+
+  settings_items :profile_picture, :type => :string, :default => ""
+
+  def self.timestamp
+    "hub-mediation-#{(Time.now.to_f * 1000).to_i}"
+  end
+
+end
diff --git a/views/community_hub_plugin_public/_mediation.rhtml b/views/community_hub_plugin_public/_mediation.rhtml
index b3ae381..c0df09c 100644
--- a/views/community_hub_plugin_public/_mediation.rhtml
+++ b/views/community_hub_plugin_public/_mediation.rhtml
@@ -7,7 +7,7 @@
 
     <li class="avatar">
       <% if mediation.source == 'twitter' %>
-        <%= image_tag(mediation.external_link, :alt => "Twitter") %>
+        <%= image_tag(mediation.profile_picture, :alt => "Twitter") %>
       <% elsif mediation.source == 'facebook' %>
         <%= image_tag('/plugins/community_hub/icons/logo_facebook_50x50.png', :alt => "Facebook") %>
       <% else %>
diff --git a/views/community_hub_plugin_public/_post.rhtml b/views/community_hub_plugin_public/_post.rhtml
index 67de60a..6f26978 100644
--- a/views/community_hub_plugin_public/_post.rhtml
+++ b/views/community_hub_plugin_public/_post.rhtml
@@ -14,7 +14,7 @@
     </li>
     <li class="message"><span class="author"><%= post.author_name %>:</span> <%= post.body %></li>
 
-    <% if mediator?(hub) %>
+    <% if mediator?(hub) && post.title != 'hub-message-facebook' %>
     <li class="mediation-bar">
       <ul>
         <li class="pin">
--
libgit2 0.21.2