diff --git a/.gitignore b/.gitignore
index 26ee897e5e..e54a3c380e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,11 @@
 *.iml
 .gradle
 /local.properties
-.idea/*
-/.idea/*
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
+# idea files: exclude everything except dictionnaries
+.idea/caches
+.idea/codeStyles
+.idea/libraries
+.idea/*.xml
 .DS_Store
 /build
 /captures
diff --git a/.idea/dictionaries/bmarty.xml b/.idea/dictionaries/bmarty.xml
new file mode 100644
index 0000000000..01981ada12
--- /dev/null
+++ b/.idea/dictionaries/bmarty.xml
@@ -0,0 +1,19 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="bmarty">
+    <words>
+      <w>backstack</w>
+      <w>bytearray</w>
+      <w>ciphertext</w>
+      <w>decryptor</w>
+      <w>emoji</w>
+      <w>emojis</w>
+      <w>hmac</w>
+      <w>ktlint</w>
+      <w>linkified</w>
+      <w>linkify</w>
+      <w>megolm</w>
+      <w>pbkdf</w>
+      <w>pkcs</w>
+    </words>
+  </dictionary>
+</component>
\ No newline at end of file