diff --git a/android/app/build.gradle b/android/app/build.gradle
index d14aa07c..99349226 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "org.ilovefreegle.direct"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1205
-        versionName "3.0.3"
+        versionCode 1207
+        versionName "3.0.5"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
diff --git a/android/app/src/main/res/xml/config.xml b/android/app/src/main/res/xml/config.xml
index 0400b2ac..021d4b21 100644
--- a/android/app/src/main/res/xml/config.xml
+++ b/android/app/src/main/res/xml/config.xml
@@ -2,6 +2,10 @@
 <widget version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
   <access origin="*" />
   
+  <feature name="Calendar">
+    <param name="android-package" value="nl.xservices.plugins.Calendar"/>
+  </feature>
+
   <feature name="InAppBrowser">
     <param name="android-package" value="org.apache.cordova.inappbrowser.InAppBrowser"/>
   </feature>
diff --git a/api/BaseAPI.js b/api/BaseAPI.js
index a6e86096..b3b27495 100644
--- a/api/BaseAPI.js
+++ b/api/BaseAPI.js
@@ -173,7 +173,7 @@ export default class BaseAPI {
         console.log('Log it?', log)
 
         if (log) {
-          Sentry.captureException(
+          Sentry.captureMessage(
             'API request failed ' +
               path +
               ' returned HTTP ' +
@@ -368,7 +368,7 @@ export default class BaseAPI {
       const log = typeof logError === 'function' ? logError(data) : logError
 
       if (log) {
-        Sentry.captureException(
+        Sentry.captureMessage(
           'API request failed ' +
             path +
             ' returned HTTP ' +
diff --git a/api/CommunityEventAPI.js b/api/CommunityEventAPI.js
index 596393e0..6573bd36 100644
--- a/api/CommunityEventAPI.js
+++ b/api/CommunityEventAPI.js
@@ -9,6 +9,10 @@ export default class CommunityEventAPI extends BaseAPI {
     return this.$getv2('/communityevent')
   }
 
+  listGroup(id) {
+    return this.$getv2('/communityevent/group/' + id)
+  }
+
   save(data) {
     return this.$patch('/communityevent', data)
   }
diff --git a/api/ConfigAPI.js b/api/ConfigAPI.js
index c9e25c41..d5c8a0f1 100644
--- a/api/ConfigAPI.js
+++ b/api/ConfigAPI.js
@@ -2,7 +2,7 @@ import BaseAPI from '@/api/BaseAPI'
 
 export default class ConfigAPI extends BaseAPI {
   async get(params) {
-    const ret = await this.$get('/config', params)
-    return ret.values
+    // https://api.ilovefreegle.org/apiv2/config/app_fd_version_android_latest etc
+    return await this.$getv2('/config/' + params.key)
   }
 }
diff --git a/api/VolunteeringAPI.js b/api/VolunteeringAPI.js
index 98ec78f8..cae81c47 100644
--- a/api/VolunteeringAPI.js
+++ b/api/VolunteeringAPI.js
@@ -9,6 +9,10 @@ export default class VolunteeringAPI extends BaseAPI {
     return this.$getv2('/volunteering')
   }
 
+  listGroup(id) {
+    return this.$getv2('/volunteering/group/' + id)
+  }
+
   save(data) {
     return this.$patch('/volunteering', data)
   }
diff --git a/app.vue b/app.vue
index 9a6c61e8..194ef7cf 100644
--- a/app.vue
+++ b/app.vue
@@ -4,13 +4,13 @@
       <MainHeader />
     </client-only>
     <NuxtLayout v-if="ready">
-      <NuxtPage :key="loginCount" />
+      <NuxtPage />
     </NuxtLayout>
   </div>
 </template>
 <script setup>
 import { useRoute } from 'vue-router'
-import { computed } from 'vue'
+import { computed, watch, nextTick, reloadNuxtApp } from '#imports'
 import { useNoticeboardStore } from './stores/noticeboard'
 import { useAuthStore } from './stores/auth'
 import { useGroupStore } from './stores/group'
@@ -117,12 +117,24 @@ logoStore.init(runtimeConfig)
 locationStore.init(runtimeConfig)
 shortlinkStore.init(runtimeConfig)
 
-// We use a key to force the whole page to re-render if we have logged in.  This is a sledgehammer way of
-// re-calling all the setup() methods etc.  Perhaps there's a better way to do this.
+// We use a key to force the whole page to re-load if we have logged in.  This is a sledgehammer way of
+// re-calling all the setup() methods etc.  Perhaps there's a better way to do this, but using a key on
+// NuxtPage results in errors which can cause the JS to bomb out.
+let loginKey = ref(0)
+
 const loginCount = computed(() => {
   return authStore.loginCount
 })
 
+watch(loginCount, async () => {
+  if (!route.query.k) {
+    await reloadNuxtApp({
+      force: true,
+      persistState: false
+    })
+  }
+})
+
 try {
   if (route.query.u && route.query.k) {
     // We are impersonating.
diff --git a/capacitor.config.ts b/capacitor.config.ts
index b97d9332..f78bd071 100644
--- a/capacitor.config.ts
+++ b/capacitor.config.ts
@@ -27,6 +27,7 @@ const config: CapacitorConfig = {
   },
   android: {
     includePlugins: [
+      "cordova-plugin-calendar",
       "cordova-plugin-inappbrowser",
       "@capacitor/app-launcher",
       "@capacitor/browser",
@@ -53,6 +54,7 @@ const config: CapacitorConfig = {
   	scheme: 'App', // Freegle
     contentInset: 'automatic',
     includePlugins: [
+      "cordova-plugin-calendar",
       "cordova-plugin-inappbrowser",
       "@capacitor/app-launcher",
       "@capacitor/browser",
diff --git a/components/AddToCalendar.vue b/components/AddToCalendar.vue
index adafb382..55a1776a 100644
--- a/components/AddToCalendar.vue
+++ b/components/AddToCalendar.vue
@@ -8,6 +8,7 @@
 </template>
 <script>
 import saveAs from 'save-file'
+import { useMobileStore } from '@/stores/mobile'
 
 export default {
   props: {
@@ -29,11 +30,68 @@ export default {
   methods: {
     async download(e) {
       // https://www.npmjs.com/package/save-file
-      console.log("AddToCalendar download")
       e.preventDefault()
       e.stopPropagation()
-      const blob = new Blob([this.ics], { type: 'text/calendar;charset=utf-8' })
-      await saveAs(blob, 'freegle-handover.ics')
+      const mobileStore = useMobileStore()
+      if( !mobileStore.isApp){
+        const blob = new Blob([this.ics], { type: 'text/calendar;charset=utf-8' })
+        await saveAs(blob, 'freegle-handover.ics')
+        return
+      }
+      /*const blob = new Blob([this.ics], { type: 'application/octet-stream' })
+      const link = document.createElement('a')
+      link.href = URL.createObjectURL(blob)
+      link.download = 'freegle-handover.ics'
+      link.click()
+      URL.revokeObjectURL(link.href)*/
+
+      /*// https://capacitorjs.com/docs/apis/filesystem
+      await Filesystem.writeFile({
+        path: 'freegle-handover.ics',
+        data: this.ics,
+        directory: Directory.Documents,
+        encoding: Encoding.UTF8,
+      })*/
+
+      // webcal://localhost/myCalendar.ics
+      // https://www.npmjs.com/package/cordova-plugin-calendar
+
+      function getCalProp(lines,name){
+        name += ':'
+        const namelen = name.length
+        for(let i=0;i<lines.length;i++){
+          const line = lines[i]
+          if( line.length>=namelen){
+            if( line.substring(0,namelen)===name){
+              let rv = line.substring(namelen)
+              while (++i < lines.length) {
+                const nextline = lines[i]
+                if (nextline.substring(0,1)!==' ') break
+                rv += nextline.substring(1)
+              }
+              return rv
+            }
+          }
+        }
+        return ''
+      }
+      const lines = this.ics.split('\r\n')
+      const dtstart = getCalProp(lines, 'DTSTART;TZID=Europe/London') // 20210109T110000
+      const year = parseInt(dtstart.substring(0,4))
+      const month = parseInt(dtstart.substring(4,6))-1
+      const dom = parseInt(dtstart.substring(6,8))
+      const hour = parseInt(dtstart.substring(9,11))
+      const mins = parseInt(dtstart.substring(11,13))
+      const secs = parseInt(dtstart.substring(13,15))
+      const startDate = new Date(year, month, dom, hour, mins, secs)
+      const endDate = new Date(startDate.getTime()+5*60*1000)
+      const title = getCalProp(lines, 'SUMMARY')
+      const eventLocation = ''
+      const notes = getCalProp(lines, 'DESCRIPTION')
+      const success = function (message) { console.log("Add calendar success", JSON.stringify(message)) }
+      const error = function (message) { alert("Error: " + message) } // TODO
+      console.log('window.plugins',window.plugins)
+      window.plugins.calendar.createEventInteractively(title, eventLocation, notes, startDate, endDate, success, error)
     },
   },
 }
diff --git a/components/ChatButton.vue b/components/ChatButton.vue
index bcd736ce..7286e3e7 100644
--- a/components/ChatButton.vue
+++ b/components/ChatButton.vue
@@ -31,6 +31,7 @@
 </template>
 <script>
 import { useChatStore } from '../stores/chat'
+import { useMessageStore } from '../stores/message'
 import { useRouter } from '#imports'
 
 export default {
@@ -83,9 +84,11 @@ export default {
   },
   setup() {
     const chatStore = useChatStore()
+    const messageStore = useMessageStore()
 
     return {
       chatStore,
+      messageStore,
     }
   },
   methods: {
@@ -130,10 +133,13 @@ export default {
             console.log('Sent')
 
             if (firstmsgid) {
-              // Refresh the message so that our reply will show.
-              await this.chatStore.fetchMessages(chatid, true)
+              // Update the message so that the reply count is updated.  No need to wait.
+              this.messageStore.fetch(firstmsgid, true)
             }
 
+            // Refresh the message so that our reply will show.
+            await this.chatStore.fetchMessages(chatid, true)
+
             this.$emit('sent')
           }
 
diff --git a/components/ChatMessageCompleted.vue b/components/ChatMessageCompleted.vue
index 4b9079a4..5987f9bb 100644
--- a/components/ChatMessageCompleted.vue
+++ b/components/ChatMessageCompleted.vue
@@ -29,8 +29,8 @@
                   <div class="small">
                     <v-icon icon="info-circle" />
                     <span v-if="refmsg?.type === 'Offer'">
-                    This is no longer available.
-                  </span>
+                      This is no longer available.
+                    </span>
                     <span v-else> Thanks, this has now been received. </span>
                   </div>
                 </NoticeMessage>
@@ -44,7 +44,9 @@
                   This is no longer available.
                 </span>
                 <span v-else> Thanks, this has now been received. </span>
-                <div class="text-muted small">This is an automated message.</div>
+                <div class="text-muted small">
+                  This is an automated message.
+                </div>
               </div>
             </b-card-text>
           </b-card>
@@ -76,8 +78,8 @@
                   <div class="text-muted small">
                     <v-icon icon="info-circle" />
                     <span v-if="refmsg?.type === 'Offer'">
-                    This is no longer available.
-                  </span>
+                      This is no longer available.
+                    </span>
                     <span v-else> Thanks, this has now been received. </span>
                   </div>
                 </NoticeMessage>
@@ -87,11 +89,13 @@
               </div>
               <div v-else>
                 <v-icon icon="info-circle" />
-                <span v-if="refmsg.type === 'Offer'">
+                <span v-if="refmsg?.type === 'Offer'">
                   We've let them know this is no longer available.
                 </span>
                 <span v-else> This has now been received. </span>
-                <div class="text-muted small">This is an automated message.</div>
+                <div class="text-muted small">
+                  This is an automated message.
+                </div>
               </div>
             </b-card-text>
           </b-card>
@@ -101,11 +105,11 @@
   </div>
 </template>
 <script>
-import ChatBase from '~/components/ChatBase'
 import NoticeMessage from './NoticeMessage'
+import ChatBase from '~/components/ChatBase'
 
 export default {
-  components: {NoticeMessage},
+  components: { NoticeMessage },
   extends: ChatBase,
 }
 </script>
diff --git a/components/ChatMessageSummary.vue b/components/ChatMessageSummary.vue
index 14f113db..8258fcd6 100644
--- a/components/ChatMessageSummary.vue
+++ b/components/ChatMessageSummary.vue
@@ -154,7 +154,7 @@ export default {
       this.imageBroken = true
     },
     click() {
-      if (this.message.fromuser === this.myid) {
+      if (this.myid && this.message.fromuser === this.myid) {
         this.$router.push('/mypost/' + this.id)
       } else {
         this.$router.push('/message/' + this.id)
diff --git a/components/DraggableMap.vue b/components/DraggableMap.vue
index ea2ee87d..9c88d5e3 100644
--- a/components/DraggableMap.vue
+++ b/components/DraggableMap.vue
@@ -48,6 +48,11 @@ export default {
       required: false,
       default: 5,
     },
+    maxZoom: {
+      type: Number,
+      required: false,
+      default: MAX_MAP_ZOOM,
+    }
   },
   async setup() {
     const runtimeConfig = useRuntimeConfig()
@@ -73,7 +78,6 @@ export default {
       mapObject: null,
       center: [53.945, -2.5209],
       zoom: 14,
-      maxZoom: MAX_MAP_ZOOM,
     }
   },
   computed: {
diff --git a/components/EmailBelongsToSomeoneElse.vue b/components/EmailBelongsToSomeoneElse.vue
index f3fafd7f..fb0c7699 100644
--- a/components/EmailBelongsToSomeoneElse.vue
+++ b/components/EmailBelongsToSomeoneElse.vue
@@ -6,15 +6,35 @@
       <strong v-if="ours">{{ ours }}</strong><strong v-else>as <v-icon icon="hashtag" class="text-muted fa-0-8x" />{{ myid }}</strong>, but <strong>{{ theirs }}</strong> belongs to another account.
     </p>
     <p>
-      If they are both yours, you can ask the volunteers to merge your accounts
-      from <em>Help</em>.
+      If they are both yours, you can ask the
+      {{ group?.namedisplay }} volunteers to merge your accounts.
     </p>
+    <b-button
+      v-if="groupid"
+      size="lg"
+      class="mb-2"
+      variant="white"
+      @click="requestMerge"
+      >Request merge</b-button
+    >
+    <SupportLink
+      v-else
+      size="lg"
+      :info="'Requesting merge of ' + ours + ' and ' + theirs"
+      text="Request merge"
+    />
   </NoticeMessage>
 </template>
 <script>
+import { computed } from 'vue'
+import { useComposeStore } from '../stores/compose'
+import { useGroupStore } from '../stores/group'
+import { useChatStore } from '../stores/chat'
 import NoticeMessage from './NoticeMessage'
+import SupportLink from '~/components/SupportLink'
+
 export default {
-  components: { NoticeMessage },
+  components: { NoticeMessage, SupportLink },
   props: {
     ours: {
       type: String,
@@ -25,5 +45,43 @@ export default {
       required: true,
     },
   },
+  setup() {
+    const composeStore = useComposeStore()
+    const groupStore = useGroupStore()
+    const chatStore = useChatStore()
+
+    const groupid = computed(() => {
+      return composeStore.group
+    })
+
+    if (groupid.value) {
+      groupStore.fetch(groupid.value)
+    }
+
+    return { composeStore, groupStore, chatStore, groupid }
+  },
+  computed: {
+    group() {
+      return this.groupStore.get(this.groupid)
+    },
+  },
+  methods: {
+    async requestMerge() {
+      const chatid = await this.chatStore.openChatToMods(this.groupid)
+
+      if (chatid) {
+        await this.chatStore.send(
+          chatid,
+            "I'd like you to merge my account " + this.ours + " into " + this.theirs + " please, with " + this.theirs + " as the primary email. You can email me at both addresses to confirm that they're both mine.",
+          null,
+          null,
+          null
+        )
+
+        const router = useRouter()
+        router.push('/chats/' + chatid)
+      }
+    },
+  },
 }
 </script>
diff --git a/components/GroupHeader.vue b/components/GroupHeader.vue
index f36e2d8d..ca9f3bde 100644
--- a/components/GroupHeader.vue
+++ b/components/GroupHeader.vue
@@ -197,7 +197,6 @@ export default {
         description = description.replace(/<p><\/p>/g, '')
       }
 
-      console.log('Return', description)
       return description
     },
   },
diff --git a/components/MessageList.vue b/components/MessageList.vue
index 59d0e112..7342f507 100644
--- a/components/MessageList.vue
+++ b/components/MessageList.vue
@@ -125,6 +125,11 @@ export default {
       required: false,
       default: false,
     },
+    none: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   async setup(props) {
     const groupStore = useGroupStore()
diff --git a/components/MessageMap.vue b/components/MessageMap.vue
index d77cd4ff..e7ecbaf3 100644
--- a/components/MessageMap.vue
+++ b/components/MessageMap.vue
@@ -98,7 +98,7 @@ export default {
           new this.L.marker([this.home.lat, this.home.lng]),
         ])
 
-        let fitTo = fg.getBounds().pad(0.1)
+        const fitTo = fg.getBounds().pad(0.1)
         if (fitTo.isValid()) {
           themap.fitBounds(fitTo)
         }
diff --git a/components/NewsReplies.vue b/components/NewsReplies.vue
index 75d32530..6ecb3476 100644
--- a/components/NewsReplies.vue
+++ b/components/NewsReplies.vue
@@ -22,7 +22,7 @@
     </div>
     <div
       v-for="reply in repliestoshow"
-      :key="'newsfeed-' + reply.id"
+      :key="'newsfeed-' + reply?.id"
       class="lines"
     >
       <NewsRefer
diff --git a/components/NotificationCommentOnComment.vue b/components/NotificationCommentOnComment.vue
index 13c76314..4ee138bf 100644
--- a/components/NotificationCommentOnComment.vue
+++ b/components/NotificationCommentOnComment.vue
@@ -22,6 +22,7 @@
 </template>
 <script>
 import { setupNotification } from '../composables/useNotification'
+import { useNewsfeedStore } from '../stores/newsfeed'
 import ProfileImage from '~/components/ProfileImage'
 
 export default {
@@ -35,6 +36,8 @@ export default {
     },
   },
   async setup(props) {
+    // Make sure we have the up to date iem in the store fairly soon.
+    useNewsfeedStore().fetch(this.newsfeed.id, true)
     return await setupNotification(props.id)
   },
 }
diff --git a/components/NotificationCommentOnPost.vue b/components/NotificationCommentOnPost.vue
index b1f084ff..b70630fd 100644
--- a/components/NotificationCommentOnPost.vue
+++ b/components/NotificationCommentOnPost.vue
@@ -24,6 +24,7 @@
 </template>
 <script>
 import { setupNotification } from '../composables/useNotification'
+import { useNewsfeedStore } from '../stores/newsfeed'
 import ProfileImage from '~/components/ProfileImage'
 
 export default {
@@ -42,6 +43,8 @@ export default {
   },
   methods: {
     click() {
+      // Make sure we have the up to date iem in the store fairly soon.
+      useNewsfeedStore().fetch(this.newsfeed.id, true)
       this.$router.push('/chitchat/' + this.newsfeed.id)
     },
   },
diff --git a/components/NotificationLovedComment.vue b/components/NotificationLovedComment.vue
index 4e03ad14..84d8e557 100644
--- a/components/NotificationLovedComment.vue
+++ b/components/NotificationLovedComment.vue
@@ -22,6 +22,7 @@
 </template>
 <script>
 import { setupNotification } from '../composables/useNotification'
+import { useNewsfeedStore } from '../stores/newsfeed'
 import ProfileImage from '~/components/ProfileImage'
 
 export default {
@@ -40,6 +41,8 @@ export default {
 
   methods: {
     click() {
+      // Make sure we have the up to date iem in the store fairly soon.
+      useNewsfeedStore().fetch(this.newsfeed.id, true)
       this.$router.push('/chitchat/' + this.newsfeed.id)
     },
   },
diff --git a/components/NotificationLovedPost.vue b/components/NotificationLovedPost.vue
index c510c31a..4206f372 100644
--- a/components/NotificationLovedPost.vue
+++ b/components/NotificationLovedPost.vue
@@ -26,6 +26,7 @@
 </template>
 <script>
 import { setupNotification } from '../composables/useNotification'
+import { useNewsfeedStore } from '../stores/newsfeed'
 import ProfileImage from '~/components/ProfileImage'
 
 export default {
@@ -56,6 +57,8 @@ export default {
   },
   methods: {
     click() {
+      // Make sure we have the up to date iem in the store fairly soon.
+      useNewsfeedStore().fetch(this.newsfeed.id, true)
       this.$router.push('/chitchat/' + this.newsfeed.id)
     },
   },
diff --git a/components/OurFilePond.vue b/components/OurFilePond.vue
index 35177c7a..b1a442be 100644
--- a/components/OurFilePond.vue
+++ b/components/OurFilePond.vue
@@ -131,7 +131,7 @@ export default {
         var imageData = image.dataUrl;
         console.log("takeAppPhoto",imageData)
 
-        this.$refs.pond.addFile(image.dataUrl);
+        // this.$refs.pond.addFile(image.dataUrl);
       }
       catch(e) {
         console.log("takeAppPhoto error",e)
@@ -141,6 +141,7 @@ export default {
     photoInit() {
       const mobileStore = useMobileStore()
       if (mobileStore.isApp) {
+        this.takeAppPhoto()
         if (mobileStore.isiOS) {
           if (this.browse) {
             this.$refs.pond.browse()
@@ -149,7 +150,6 @@ export default {
           setTimeout(() => { // this.$nextTick didn't work
             const takePhoto = this.$el.querySelector('.take-photo')
             if( takePhoto){
-            this.takeAppPhoto()
             takePhoto.addEventListener('click', e => {
               this.takeAppPhoto()
               e.preventDefault()
diff --git a/components/OutcomeModal.vue b/components/OutcomeModal.vue
index 97dc06e2..2f99bba9 100644
--- a/components/OutcomeModal.vue
+++ b/components/OutcomeModal.vue
@@ -77,8 +77,8 @@
               placeholder="e.g. Thanks for the interest. Sorry, this went to someone else."
             />
             <p class="mt-1 text-muted small">
-              <v-icon icon="lock" /> We'll send this privately in Chat to each
-              other freegler who replied to your post.
+              <v-icon icon="lock" /> We'll send this same message privately in
+              Chat to each other freegler who replied to your post.
             </p>
           </div>
           <hr class="mb-0" />
@@ -361,7 +361,7 @@ export default {
             outcome: this.type,
             happiness: this.happiness,
             comment: this.comments,
-            message: this.completionMessage
+            message: this.completionMessage,
           })
 
           this.hide()
diff --git a/components/PosterModal.vue b/components/PosterModal.vue
index 624e7905..7a66bf85 100644
--- a/components/PosterModal.vue
+++ b/components/PosterModal.vue
@@ -14,7 +14,7 @@
       Please drag/zoom the map until the marker shows where the poster is.
     </notice-message>
     <client-only>
-      <DraggableMap v-if="loaded" ref="map" :initial-zoom="7" class="mb-2" />
+      <DraggableMap v-if="loaded" ref="map" :initial-zoom="7" class="mb-2" :max-zoom="17" />
     </client-only>
     <h4>Please add more info</h4>
     <b-form-input
diff --git a/components/SupportLink.vue b/components/SupportLink.vue
index 9d35e8ba..c09def97 100644
--- a/components/SupportLink.vue
+++ b/components/SupportLink.vue
@@ -14,14 +14,22 @@ export default {
       type: String,
       default: 'support@ilovefreegle.org',
     },
+    info: {
+      type: String,
+      required: false,
+      default: '',
+    },
   },
   computed: {
     href() {
+      const infostr = this.info ? '%0D%0A%0D%0A' + this.info : ''
       if (this.myid) {
         return (
           'mailto:' +
           this.email +
-          '?body=%0D%0A%0D%0ANote to support: this freegler was logged in as user id: #' +
+          '?body=' +
+          infostr +
+          '%0D%0A%0D%0ANote to support: this freegler was logged in as user id: #' +
           this.myid +
           '.'
         )
@@ -29,7 +37,9 @@ export default {
         return (
           'mailto:' +
           this.email +
-          '?body=%0D%0A%0D%0ANote to support: this freegler was not logged in when contacting Support to send this mail.'
+          '?body=' +
+          infostr +
+          '%0D%0A%0D%0ANote to support: this freegler was not logged in when contacting Support to send this mail.'
         )
       }
     },
diff --git a/config.js b/config.js
index c8a9f236..be831b6e 100644
--- a/config.js
+++ b/config.js
@@ -34,5 +34,5 @@ export default {
     'https://63f870e6c729477ebca4098a0b07fd3a@o118493.ingest.sentry.io/4504083802226688',
 
   ISAPP: process.env.IZNIK_NUXT3_IS_APP === 'true',
-  MOBILE_VERSION: '3.0.3',
+  MOBILE_VERSION: '3.0.5',
 }
diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj
index 61f1c551..2568adf0 100644
--- a/ios/App/App.xcodeproj/project.pbxproj
+++ b/ios/App/App.xcodeproj/project.pbxproj
@@ -357,12 +357,12 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1200;
+				CURRENT_PROJECT_VERSION = 1202;
 				DEVELOPMENT_TEAM = GMYU3K9D84;
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 3.0.0;
+				MARKETING_VERSION = 3.0.5;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = org.ilovefreegle.iphone;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -379,12 +379,12 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1200;
+				CURRENT_PROJECT_VERSION = 1202;
 				DEVELOPMENT_TEAM = GMYU3K9D84;
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 3.0.0;
+				MARKETING_VERSION = 3.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = org.ilovefreegle.iphone;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
diff --git a/ios/App/App/Info.plist b/ios/App/App/Info.plist
index f2853410..b7209d86 100644
--- a/ios/App/App/Info.plist
+++ b/ios/App/App/Info.plist
@@ -106,5 +106,17 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+  <key>FacebookAutoLogAppEventsEnabled</key>
+  <false/>
+  <key>FacebookAdvertiserIDCollectionEnabled</key>
+  <false/>
+  <key>ITSAppUsesNonExemptEncryption</key>
+  <false/>
+  <key>UIFileSharingEnabled</key>
+  <string>YES</string>
+  <key>LSSupportsOpeningDocumentsInPlace</key>
+  <string>YES</string>
+  <key>NSCalendarsUsageDescription</key>
+  <string>To save Freegle handover appointments to your calendar</string>
 </dict>
 </plist>
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 1eec1e97..9e484163 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -1,8 +1,8 @@
-import config from './config'
 import path from 'path-browserify'
 import { VitePWA } from 'vite-plugin-pwa'
 import eslintPlugin from 'vite-plugin-eslint'
 import legacy from '@vitejs/plugin-legacy'
+import config from './config'
 
 // Mobile version change:
 // - config.js: MOBILE_VERSION eg 3.0.0
diff --git a/package-lock.json b/package-lock.json
index 010fc3de..969d34c5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,7 +25,7 @@
         "@fortawesome/free-brands-svg-icons": "^6.2.0",
         "@fortawesome/free-solid-svg-icons": "^6.1.1",
         "@fortawesome/vue-fontawesome": "^3.0.0-5",
-        "@freegle/capacitor-push-notifications": "github:Freegle/capacitor-push-notifications#768cb10",
+        "@freegle/capacitor-push-notifications": "github:Freegle/capacitor-push-notifications",
         "@nuxtjs/sentry": "^5.1.7",
         "@pinia/nuxt": "0.4.6",
         "@popperjs/core": "^2.11.4",
@@ -43,6 +43,7 @@
         "bootstrap": "5.2.3",
         "bootstrap-vue-next": "^0.7.3",
         "capacitor-zoom-android": "^1.0.0",
+        "cordova-plugin-calendar": "^5.1.6",
         "cordova-plugin-inappbrowser": "^5.0.0",
         "dayjs": "^1.11.0",
         "eslint-plugin-import": "^2.27.5",
@@ -8745,6 +8746,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/cordova-plugin-calendar": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-calendar/-/cordova-plugin-calendar-5.1.6.tgz",
+      "integrity": "sha512-aaK5XRHIiR+1AYEwmXbFL98Q/I62OoUMAbxK0DTpICo0M3luihomr0S+YXstDLL0MyIKOB3WtRHVuCP4y97kHw==",
+      "engines": {
+        "cordovaDependencies": {
+          "3.0.0": {
+            "cordova-android": ">=6.3.0"
+          }
+        }
+      }
+    },
     "node_modules/cordova-plugin-inappbrowser": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/cordova-plugin-inappbrowser/-/cordova-plugin-inappbrowser-5.0.0.tgz",
diff --git a/package.json b/package.json
index fabde9c7..41ad11d3 100644
--- a/package.json
+++ b/package.json
@@ -11,8 +11,7 @@
   "engines": {
     "node": ">=17.9.1"
   },
-  "comments":{
-  },
+  "comments": {},
   "devDependencies": {
     "@capacitor/cli": "^4.0.0",
     "@nuxtjs/eslint-config": "^12.0.0",
@@ -44,13 +43,13 @@
     "@capacitor/network": "^4.0.0",
     "@capacitor/share": "^4.0.0",
     "@capawesome/capacitor-badge": "^2.0.0",
-    "@freegle/capacitor-push-notifications": "github:Freegle/capacitor-push-notifications",
     "@chenfengyuan/vue-number-input": "^2.0.1",
     "@codetrix-studio/capacitor-google-auth": "3.2.2",
     "@fortawesome/fontawesome-svg-core": "^6.4.0",
     "@fortawesome/free-brands-svg-icons": "^6.2.0",
     "@fortawesome/free-solid-svg-icons": "^6.1.1",
     "@fortawesome/vue-fontawesome": "^3.0.0-5",
+    "@freegle/capacitor-push-notifications": "github:Freegle/capacitor-push-notifications",
     "@nuxtjs/sentry": "^5.1.7",
     "@pinia/nuxt": "0.4.6",
     "@popperjs/core": "^2.11.4",
@@ -68,6 +67,7 @@
     "bootstrap": "5.2.3",
     "bootstrap-vue-next": "^0.7.3",
     "capacitor-zoom-android": "^1.0.0",
+    "cordova-plugin-calendar": "^5.1.6",
     "cordova-plugin-inappbrowser": "^5.0.0",
     "dayjs": "^1.11.0",
     "eslint-plugin-import": "^2.27.5",
diff --git a/pages/chitchat/[[id]].vue b/pages/chitchat/[[id]].vue
index 2d3a1f62..fc9eccfe 100644
--- a/pages/chitchat/[[id]].vue
+++ b/pages/chitchat/[[id]].vue
@@ -123,10 +123,10 @@
             <div v-else>
               <NewsThread
                 v-for="entry in newsfeedToShow"
-                :id="entry.id"
+                :id="entry?.id"
                 :key="
                   'newsfeed-' +
-                  entry.id +
+                  entry?.id +
                   '-area-' +
                   selectedArea +
                   '-' +
diff --git a/pages/communityevents/[[groupid]].vue b/pages/communityevents/[[groupid]].vue
index 92f5ac55..c23888ac 100644
--- a/pages/communityevents/[[groupid]].vue
+++ b/pages/communityevents/[[groupid]].vue
@@ -16,13 +16,16 @@
                 :value="groupid"
                 @update:model-value="changeGroup"
               />
-              <b-button variant="primary" @click="openEventModal">
+              <b-button variant="primary" @click="openEventModal" v-if="me">
                 <v-icon icon="plus" /> Add a community event
               </b-button>
+              <NoticeMessage variant="info" v-else>
+                Please sign in and join a community to add an event.
+              </NoticeMessage>
             </div>
           </div>
           <h2 class="visually-hidden">List of community events</h2>
-          <div v-if="forUser?.length">
+          <div v-if="allOfEm?.length">
             <div v-for="id in events" :key="'event-' + id" class="mt-2">
               <CommunityEvent
                 :id="id"
@@ -39,7 +42,7 @@
             />
           </div>
           <div v-else>
-            <NoticeMessage>No events at the moment.</NoticeMessage>
+            <NoticeMessage variant="warning">No events at the moment.</NoticeMessage>
           </div>
         </b-col>
         <b-col cols="0" md="3" class="d-none d-md-block" />
@@ -82,6 +85,8 @@ if (groupid.value) {
   const group = await groupStore.fetch(groupid.value)
   name = 'Community Events for ' + group.namedisplay
   image = group?.profile
+
+  await communityEventStore.fetchGroup(groupid.value)
 } else {
   groupid.value = '0'
 
@@ -110,12 +115,16 @@ useHead(
 const toShow = ref(0)
 const infiniteId = ref(new Date().toString())
 
-const forUser = computed(() => {
-  return communityEventStore.forUser
+const allOfEm = computed(() => {
+  if (groupid.value) {
+    return communityEventStore.forGroup
+  } else {
+    return communityEventStore.allOfEm
+  }
 })
 
 const events = computed(() => {
-  return forUser.value.slice(0, toShow.value)
+    return allOfEm.value.slice(0, toShow.value)
 })
 
 const changeGroup = function (newval) {
@@ -123,7 +132,7 @@ const changeGroup = function (newval) {
   router.push(newval ? '/communityevents/' + newval : '/communityevents')
 }
 const loadMore = function ($state) {
-  if (toShow.value < forUser.value.length) {
+  if (toShow.value < allOfEm.value.length) {
     toShow.value++
     $state.loaded()
   } else {
diff --git a/pages/find/whoami.vue b/pages/find/whoami.vue
index cb82a44c..9e5f963e 100644
--- a/pages/find/whoami.vue
+++ b/pages/find/whoami.vue
@@ -36,14 +36,14 @@
         <EmailBelongsToSomeoneElse
           v-if="emailValid && emailBelongsToSomeoneElse"
           class="mb-2"
-          :ours="me?.email"
+          :ours="me?.email ? me.email : ('#' + myid)"
           :theirs="email"
         />
       </div>
       <div class="d-block d-md-none flex-grow-1" />
       <div class="d-block d-md-none margbott">
         <b-button
-          v-if="emailValid && !submitting"
+          v-if="emailValid && !submitting && !emailBelongsToSomeoneElse"
           variant="primary"
           size="lg"
           block
@@ -64,7 +64,7 @@
             <v-icon icon="angle-double-left" /> Back
           </b-button>
           <b-button
-            v-if="emailValid && !submitting"
+            v-if="emailValid && !submitting && !emailBelongsToSomeoneElse"
             variant="primary"
             size="lg"
             @click="next"
diff --git a/pages/give/whoami.vue b/pages/give/whoami.vue
index 7fefbc70..24d4337b 100644
--- a/pages/give/whoami.vue
+++ b/pages/give/whoami.vue
@@ -36,14 +36,14 @@
         <EmailBelongsToSomeoneElse
           v-if="emailValid && emailBelongsToSomeoneElse"
           class="mb-2"
-          :ours="me?.email"
+          :ours="me?.email ? me.email : ('#' + myid)"
           :theirs="email"
         />
       </div>
       <div class="d-block d-md-none flex-grow-1" />
       <div class="d-block d-md-none margbott">
         <b-button
-          v-if="emailValid && !submitting"
+          v-if="emailValid && !submitting && !emailBelongsToSomeoneElse"
           variant="primary"
           size="lg"
           block
@@ -64,7 +64,7 @@
             <v-icon icon="angle-double-left" /> Back
           </b-button>
           <b-button
-            v-if="emailValid && !submitting"
+            v-if="emailValid && !submitting && !emailBelongsToSomeoneElse"
             variant="primary"
             size="lg"
             @click="next"
diff --git a/pages/volunteerings/[[groupid]].vue b/pages/volunteerings/[[groupid]].vue
index e9161183..97a63c4e 100644
--- a/pages/volunteerings/[[groupid]].vue
+++ b/pages/volunteerings/[[groupid]].vue
@@ -19,13 +19,16 @@
                 :value="groupid"
                 @update:model-value="changeGroup"
               />
-              <b-button variant="primary" @click="openVolunteerModal">
+              <b-button variant="primary" @click="openVolunteerModal" v-if="me">
                 <v-icon icon="plus" /> Add an opportunity
               </b-button>
+              <NoticeMessage variant="info" v-else>
+                Please sign in and join a community to add an event.
+              </NoticeMessage>
             </div>
           </div>
           <h2 class="visually-hidden">List of volunteer opportunities</h2>
-          <div v-if="forUser?.length">
+          <div v-if="allOfEm?.length">
             <div
               v-for="id in volunteerings"
               :key="'volunteering-' + id"
@@ -87,6 +90,8 @@ if (groupid.value) {
   const group = await groupStore.fetch(groupid.value)
   name = 'Volunteer Opportunities for ' + group.namedisplay
   image = group?.profile
+
+  await volunteeringStore.fetchGroup(groupid.value)
 } else {
   groupid.value = '0'
 
@@ -115,12 +120,16 @@ useHead(
 const toShow = ref(0)
 const infiniteId = ref(new Date().toString())
 
-const forUser = computed(() => {
-  return volunteeringStore.forUser
+const allOfEm = computed(() => {
+  if (groupid.value) {
+    return volunteeringStore.forGroup
+  } else {
+    return volunteeringStore.allOfEm
+  }
 })
 
 const volunteerings = computed(() => {
-  return forUser.value.slice(0, toShow.value)
+  return allOfEm.value.slice(0, toShow.value)
 })
 
 const changeGroup = function (newval) {
@@ -128,7 +137,7 @@ const changeGroup = function (newval) {
   router.push(newval ? '/volunteerings/' + newval : '/volunteerings')
 }
 const loadMore = function ($state) {
-  if (toShow.value < forUser.value.length) {
+  if (toShow.value < allOfEm.value.length) {
     toShow.value++
     $state.loaded()
   } else {
diff --git a/stores/communityevent.js b/stores/communityevent.js
index 305b85b5..23874cea 100644
--- a/stores/communityevent.js
+++ b/stores/communityevent.js
@@ -8,6 +8,7 @@ export const useCommunityEventStore = defineStore({
   state: () => ({
     list: {},
     forUser: [],
+    forGroup: [],
   }),
   actions: {
     init(config) {
@@ -49,6 +50,9 @@ export const useCommunityEventStore = defineStore({
     async fetchList(id) {
       this.forUser = await api(this.config).communityevent.list(id)
     },
+    async fetchGroup(id) {
+      this.forGroup = await api(this.config).communityevent.listGroup(id)
+    },
     async setPhoto(id, photoid) {
       await api(this.config).communityevent.setPhoto(id, photoid)
       await this.fetch(id, true)
diff --git a/stores/mobile.js b/stores/mobile.js
index 6fc946ab..da33bfaf 100644
--- a/stores/mobile.js
+++ b/stores/mobile.js
@@ -82,7 +82,9 @@ export const useMobileStore = defineStore({ // Do not persist
           console.log("PHDCC ZZZ ", e.message)
         }
       }*/
-      Capacitor.Plugins.ZoomPlugin.enableZoom()
+      if (!this.isiOS) {
+        Capacitor.Plugins.ZoomPlugin.enableZoom()
+      }
     },
 
     /*async initFirebaseMessaging() {
@@ -503,6 +505,12 @@ export const useMobileStore = defineStore({ // Do not persist
     },
     //////////////
     async checkForAppUpdate($api, $axios, store, router) {
+      // https://api.ilovefreegle.org/apiv2/config/app_fd_version_android_latest
+      // https://api.ilovefreegle.org/apiv2/config/app_fd_version_android_required
+      // https://api.ilovefreegle.org/apiv2/config/app_fd_version_ios_latest
+      // https://api.ilovefreegle.org/apiv2/config/app_fd_version_ios_required
+
+
       const requiredKey = this.isiOS ? 'app_fd_version_ios_required' : 'app_fd_version_android_required'
       const latestKey = this.isiOS ? 'app_fd_version_ios_latest' : 'app_fd_version_android_latest'
 
diff --git a/stores/volunteering.js b/stores/volunteering.js
index b4d96560..95d5162f 100644
--- a/stores/volunteering.js
+++ b/stores/volunteering.js
@@ -8,6 +8,7 @@ export const useVolunteeringStore = defineStore({
   state: () => ({
     list: {},
     forUser: [],
+    forGroup: [],
   }),
   actions: {
     init(config) {
@@ -49,6 +50,9 @@ export const useVolunteeringStore = defineStore({
     async fetchList(id) {
       this.forUser = await api(this.config).volunteering.list(id)
     },
+    async fetchGroup(id) {
+      this.forGroup = await api(this.config).volunteering.listGroup(id)
+    },
     async setPhoto(id, photoid) {
       await api(this.config).volunteering.setPhoto(id, photoid)
       await this.fetch(id, true)