diff --git a/README.md b/README.md
index 823c829..8d896f2 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 # Discourse for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/discourse.svg)](https://ci-apps.yunohost.org/jenkins/job/discourse%20%28Community%29/lastBuild/consoleFull)  
+[![Integration level](https://dash.yunohost.org/integration/discourse.svg)](https://ci-apps.yunohost.org/jenkins/job/discourse%20%28Community%29/lastBuild/consoleFull)
 [![Install Discourse with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=discourse)
 
-> *This package allows you to install discourse quickly and simply on a YunoHost server.  
+> *This package allows you to install discourse quickly and simply on a YunoHost server.
 If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.*
 
 ## Disclaimer
@@ -47,6 +47,18 @@ To learn more about the philosophy and goals of the project, [visit **discourse.
 
 Use the admin panel of your discourse to configure this app.
 
+### Configuring "Reply-By-Email"
+
+* You should create a dedicated Yunohost user for Discourse whose mailbox will be used by the Discourse application. You can do this with `yunohost user create response`, for example. You should ensure that the email address is configured to be on your Discourse domain.
+
+* You should then configure your Discourse `/var/www/discourse/config/discourse.conf` file with the correct SMTP configuration values. Please see [this comment](https://github.com/YunoHost-Apps/discourse_ynh/issues/2#issuecomment-409510325) for an explanation of what values to change. Please be aware, when you update the application, you will have to re-apply this configuration.
+
+* You must enable the Pop3 configuration for Dovecot. See [this thread](https://forum.yunohost.org/t/how-to-enable-pop3-in-yunohost/1662/2) on how to do that. You can validate your configuration with `systemctl restart dovecot && dovecot -n`. Don't forget to open the ports you need (`995` is the default). You can validate that with `nmap -p 995 yunohostdomain.org`.
+
+* You should then configure the Pop3 polling in the Discourse admin interface. Please see [this comment](https://meta.discourse.org/t/set-up-reply-via-email-support/14003) for how to do so. You will need to follow step 5 in that comment. You can specify your main Yunohost domain for the `pop3_polling_host`.
+
+You should now be able to start testing. Try using the `/admin/email` "Send Test Email" and then view the "Sent" or "Skipped" etc. tabs. You should see a report on what happened with the email. You may also want to look in `/var/www/discourse/log/production.log` as well as `/var/www/mail.err`. You should perhaps also use [Rainloop](https://github.com/YunoHost-Apps/rainloop_ynh) or another Yunohost email client application to quickly test that both your user and the dedicated Yunohost Discourse user (`response@...`) is receiving mail.
+
 ## Documentation
 
  * Official documentation: https://www.discourse.org/
@@ -99,7 +111,7 @@ bash: BASH_XTRACEFD: 7: invalid value for trace file descriptor
 cd /var/www/discourse
 sudo -i -u discourse RAILS_ENV=production bin/rake --trace plugin:install repo=https://github.com/discourse/discourse-solved (for example)
 sudo -i -u discourse RAILS_ENV=production bin/rake --trace assets:precompile
-systemctl restart discourse-puma
+systemctl restart discourse
 ```
 
 ## Links
diff --git a/sources/patches/app-4-Fix-version-detection.patch b/sources/patches/app-4-fix-missing-git-repository.patch
similarity index 51%
rename from sources/patches/app-4-Fix-version-detection.patch
rename to sources/patches/app-4-fix-missing-git-repository.patch
index efe97d0..c02d177 100644
--- a/sources/patches/app-4-Fix-version-detection.patch
+++ b/sources/patches/app-4-fix-missing-git-repository.patch
@@ -10,3 +10,13 @@ index 2b53a91eb3..eec55647d5 100644
 +        self.try_git(git_cmd, Discourse::VERSION::STRING)
        end
    end
+
+@@ -448,7 +448,7 @@ module Discourse
+     $last_commit_date ||=
+       begin
+         git_cmd = 'git log -1 --format="%ct"'
+-        seconds = self.try_git(git_cmd, nil)
++        seconds = '1563199245' # Note(decentral1se): Output from actual command in the v2.3.2 branch
+         seconds.nil? ? nil : DateTime.strptime(seconds, '%s')
+       end
+   end