diff --git a/local_config.ini.spec b/local_config.ini.spec
index 3c538a3..8eef51d 100644
--- a/local_config.ini.spec
+++ b/local_config.ini.spec
@@ -7,6 +7,7 @@ src-url = string
 bot_nickname = string
 bot_owner = string
 bot_owner_email = string
+detectlanguage_api_key = string
 
 # rate limiting
 hist_max_count = integer(default=5)
diff --git a/plugins/commands.py b/plugins/commands.py
index d0bd3ed..caecc99 100644
--- a/plugins/commands.py
+++ b/plugins/commands.py
@@ -5,6 +5,7 @@ import re
 import time
 import traceback
 import unicodedata
+import shlex
 
 import requests
 from lxml import etree
@@ -761,7 +762,15 @@ def raise_an_error(argv, **args):
         raise RuntimeError("Exception for debugging")
 
 
-@pluginfunction('translate', 'translate text fragments, use translate show to get a list of languages', ptypes_COMMAND)
+@pluginfunction('repeat', 'repeat the last message', ptypes_COMMAND)
+def repeat_message(argv, **args):
+    return {
+        'msg': args['stack'][-1]['body']
+    }
+
+
+@pluginfunction('translate', 'translate text fragments, use "translate show" to get a list of languages'
+                             'or "translate that" to get the last message translated (to german)', ptypes_COMMAND)
 def translate(argv, **args):
     available_languages = [code[0] for code in languages]
 
@@ -769,6 +778,23 @@ def translate(argv, **args):
         return {
             'priv_msg': 'All language codes: {}'.format(', '.join(available_languages))
         }
+    elif argv and argv[0] == 'that':
+        api_key = config.conf_get('detectlanguage_api_key')
+        if not api_key:
+            return
+        message_stack = args['stack']
+        last_message = message_stack[-1]['body']
+        data = {
+            'q': last_message,
+            'key': api_key
+        }
+        result = requests.post('http://ws.detectlanguage.com/0.2/detect', data=data).json()
+        educated_guess = result['data']['detections'][0]
+        if not educated_guess['isReliable']:
+            return {'msg': 'not sure about the language.'}
+        else:
+            return translate(['{}|de'.format(educated_guess['language'])] + shlex.split(last_message))
+
     pattern = '^(?P<from_lang>[a-z-]{2})(-(?P<from_ct>[a-z-]{2}))?\|(?P<to_lang>[a-z-]{2})(-(?P<to_ct>[a-z-]{2}))?$'
     pair = re.match(pattern, argv[0])
     if len(argv) < 2 or not pair:
diff --git a/urlbot.py b/urlbot.py
index 41c6c26..8845d53 100755
--- a/urlbot.py
+++ b/urlbot.py
@@ -42,6 +42,7 @@ class UrlBot(IdleBot):
 
         self.hist_ts = {p: [] for p in rate_limit_classes}
         self.hist_flag = {p: True for p in rate_limit_classes}
+        self.message_stack = []
 
         self.add_event_handler('message', self.message)
         self.priority = 100
@@ -238,6 +239,10 @@ class UrlBot(IdleBot):
                         self.send_reply(ret['msg'], msg_obj)
         except Exception as e:
             self.logger.exception(e)
+        finally:
+            if len(self.message_stack) > 4:
+                self.message_stack.pop(0)
+            self.message_stack.append(msg_obj)
 
     def data_parse_commands(self, msg_obj):
         """
@@ -284,7 +289,8 @@ class UrlBot(IdleBot):
                 parser_list=[pl.plugin_name for pl in plugin_storage[ptypes_PARSE]],
                 reply_user=reply_user,
                 msg_obj=msg_obj,
-                argv=words[2:] if len(words) > 1 else []
+                argv=words[2:] if len(words) > 1 else [],
+                stack=self.message_stack
             )
 
             if ret: