diff --git a/getter.py b/getter.py
index 81b5370..0e10f18 100755
--- a/getter.py
+++ b/getter.py
@@ -35,6 +35,7 @@ while True:
   sender = status.user.screen_name.encode("UTF-8")
   twid = int(status.id)
   comment = ""
+  wordlist = []
   if "storn" in text.lower():
    try:
     api.update_status("@%s Okay, dein Wecktweet wurde storniert." % sender, twid)
@@ -72,8 +73,12 @@ while True:
 
   words = text.split(" ")
   for word in words:
-   if word[0] == "@":
-    comment += word + " "
+   if word[0] == "@" and (not user == word[1:]) and (not sender == word[1:]):
+    wordlist += word
+
+  wordlist = list(set(wordlist))
+  for word in wordlist:
+   comment += word + " "
 
   cur.execute("INSERT INTO tweets VALUES(%i,'%s','%s','%s',0)" % (twid,date.strftime("%Y-%m-%dT%H:%M:%S"),sender,comment.strip()))
   sql_conn.commit()