diff --git a/changelog.md b/changelog.md
index 6d2ae24..0f08c5b 100644
--- a/changelog.md
+++ b/changelog.md
@@ -7,6 +7,9 @@
 * Now It's possible to add photos to the wall, by uploading files to the VK servers. Check the attachments button in the new post dialogue for this. Basically it is possible to add some photos and when the post is sent, photos will start to be uploaded before. At the moment it is not possible to add descriptions to photos. Take in to account that photos will be uploaded when the send button is pressed and the post could take some time before being posted.
 * Added a new option to the menu bar: new timeline. It allows to create a special buffer for a selected user. This buffer could be an audio or wall buffer, when created, the buffer will be updated with items for the specified user or community.
 * Added an user selection control. In dialogues  where an user must be selected, there will be an edit box with a selected name. You need to start writing for changing this name, or just press the down arrow for looking in the users' database. You can start writing and then press the down arrow, so you will see the closest result  to the name you was writing. For example if you want to write manuel, you could write m, a, n, u, and press the down arrow, and you will see the full name in the edit box. Take in to account that you have to make sure that you write a valid user name in the box, otherwise you will see an error.
+* Posts from twitter are displayed in a better way (newline characters (\n) are handled properly instead being displayed).
+* In the play all function, everything should be cleaned before start the new playback.
+* Now links included in text of a comment are included as attachments (links are "untitled" because it isn't possible to retrieve information for every link without performance issues). This is especially useful when someone posts a link from Twitter.
 
 ## Changes for build 2016.04.5 (5/04/2016)
 
diff --git a/src/controller/posts.py b/src/controller/posts.py
index 2df30f7..20bb252 100644
--- a/src/controller/posts.py
+++ b/src/controller/posts.py
@@ -111,7 +111,6 @@ class postController(object):
 		self.dialog.set_title(title)
 		message = u""
 		message = get_message(self.post)
-		self.get_attachments(self.post)
 		if self.post.has_key("copy_history"):
 			nm = u"\n"
 			for i in self.post["copy_history"]:
@@ -119,6 +118,7 @@ class postController(object):
 				self.get_attachments(i)
 			message += nm
 		self.dialog.set_post(message)
+		self.get_attachments(self.post)
 
 	def get_attachments(self, post):
 		attachments = []
@@ -129,6 +129,17 @@ class postController(object):
 					continue
 				attachments.append(add_attachment(i))
 				self.attachments.append(i)
+		# Links in text are not treated like normal attachments, so we'll have to catch and add those to the list without title
+		# We can't get a title because title is provided by the VK API and it will not work for links as simple text.
+		urls = utils.find_urls_in_text(self.dialog.get("post_view"))
+		print urls
+		if len(urls) > 0:
+			links = []
+			for i in urls:
+				links.append({"link": {"title": _(U"Untitled link"), "url": i}, "type": "link"})
+			for i in links:
+				attachments.append(add_attachment(i))
+				self.attachments.append(i)
 		if len(self.attachments) > 0:
 			self.dialog.attachments.list.Enable(True)
 			self.dialog.attachments.list.Bind(wx.EVT_LIST_ITEM_ACTIVATED, self.open_attachment)