diff --git a/.gitignore b/.gitignore
index b7f16c5fa3..1b2afabc87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 .idea
 !.idea/copyright/Bitsquare_Affero_GPLv3.xml
 !.idea/copyright/profiles_settings.xml
+!.idea/codeStyleSettings.xml
 bitsquare.iml
 *.spvchain
 *.wallet
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
new file mode 100644
index 0000000000..26c9f1cb83
--- /dev/null
+++ b/.idea/codeStyleSettings.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <option name="LINE_SEPARATOR" value="&#10;" />
+        <XML>
+          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+        </XML>
+        <codeStyleSettings language="JAVA">
+          <option name="FIELD_ANNOTATION_WRAP" value="0" />
+        </codeStyleSettings>
+      </value>
+    </option>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </component>
+</project>
+