--- a/.elisp/settings/40.modes.el
+++ b/.elisp/settings/40.modes.el
@@ -74,3 +74,18 @@ point."
 (add-hook 'compilation-mode-hook '(lambda () (local-set-key "g" 'recompile)))
 
 (column-number-mode)
+
+
+(defun annotation-fix (unused)
+  "fix indentation after an annotation"
+  (save-excursion
+    (beginning-of-line)
+    (forward-word -1)
+    (if (eq (char-before) ?@) ;; There's an annotation there
+        0
+      (+ c-basic-offset c-basic-offset))))
+
+(add-hook 'java-mode-hook
+          (lambda ()
+            (c-set-offset 'topmost-intro-cont
+                          annotation-fix)))