diff --git a/classes/plugin_button.php b/classes/plugin_button.php
new file mode 100644
index 000000000..6cb8ec1b9
--- /dev/null
+++ b/classes/plugin_button.php
@@ -0,0 +1,11 @@
+<?php
+class Plugin_Button {
+
+	protected $link;
+
+	function __construct($link) {
+		$this->link = $link;
+	}
+
+}
+?>
diff --git a/classes/tweet_button.php b/classes/tweet_button.php
new file mode 100644
index 000000000..470bc63a1
--- /dev/null
+++ b/classes/tweet_button.php
@@ -0,0 +1,31 @@
+<?php
+class Tweet_Button extends Plugin_Button {
+	function render($article_id) {
+		$rv = "<img src=\"".theme_image($this->link, 'images/art-tweet.png')."\"
+			class='tagsPic' style=\"cursor : pointer\"
+			onclick=\"tweetArticle($article_id)\"
+			title='".__('Share on Twitter')."'>";
+
+		return $rv;
+	}
+
+	function getTweetInfo() {
+		$id = db_escape_string($_REQUEST['id']);
+
+		$result = db_query($this->link, "SELECT title, link
+				FROM ttrss_entries, ttrss_user_entries
+				WHERE id = '$id' AND ref_id = id AND owner_uid = " .$_SESSION['uid']);
+
+		if (db_num_rows($result) != 0) {
+			$title = truncate_string(strip_tags(db_fetch_result($result, 0, 'title')),
+				100, '...');
+			$article_link = db_fetch_result($result, 0, 'link');
+		}
+
+		print json_encode(array("title" => $title, "link" => $article_link,
+				"id" => $id));
+	}
+
+
+}
+?>
diff --git a/js/tweet_button.js b/js/tweet_button.js
new file mode 100644
index 000000000..d127010ac
--- /dev/null
+++ b/js/tweet_button.js
@@ -0,0 +1,31 @@
+	function tweetArticle(id) {
+	try {
+		var query = "?op=rpc&method=buttonPlugin&plugin=tweet&plugin_method=getTweetInfo&id=" + param_escape(id);
+
+		console.log(query);
+
+		var d = new Date();
+      var ts = d.getTime();
+
+		var w = window.open('backend.php?op=backend&method=loading', 'ttrss_tweet',
+			"status=0,toolbar=0,location=0,width=500,height=400,scrollbars=1,menubar=0");
+
+		new Ajax.Request("backend.php",	{
+			parameters: query,
+			onComplete: function(transport) {
+				var ti = JSON.parse(transport.responseText);
+
+				var share_url = "http://twitter.com/share?_=" + ts +
+					"&text=" + param_escape(ti.title) +
+					"&url=" + param_escape(ti.link);
+
+				w.location.href = share_url;
+
+			} });
+
+
+	} catch (e) {
+		exception_error("tweetArticle", e);
+	}
+	}
+